diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt index e68ec0f..7d131ae 100644 --- a/typo3/sysext/css_styled_content/static/setup.txt +++ b/typo3/sysext/css_styled_content/static/setup.txt @@ -1719,6 +1719,7 @@ tt_content.mailform = COA tt_content.mailform.10 = < lib.stdheader tt_content.mailform.20 = FORM tt_content.mailform.20 { + useDefaultContentObject = 1 accessibility = 1 noWrapAttr=1 formName = mailform diff --git a/typo3/sysext/form/Classes/Controller/FormController.php b/typo3/sysext/form/Classes/Controller/FormController.php index b0cbda2..75a7b9f 100644 --- a/typo3/sysext/form/Classes/Controller/FormController.php +++ b/typo3/sysext/form/Classes/Controller/FormController.php @@ -92,7 +92,9 @@ class FormController { */ public function cObjGetSingleExt($typoScriptObjectName, array $typoScript, $typoScriptKey, \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject) { $content = ''; - if ($typoScriptObjectName === 'FORM') { + if ($typoScriptObjectName === 'FORM' && !empty($typoScript['useDefaultContentObject'])) { + $content = $contentObject->getContentObject($typoScriptObjectName)->render($typoScript); + } elseif ($typoScriptObjectName === 'FORM') { if ($contentObject->data['CType'] === 'mailform') { $bodytext = $contentObject->data['bodytext']; /** @var $typoScriptParser \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser */