[BUGFIX] Exception using cObject FORM in TypoScript 17/23717/2
authorAndreas Bouche <bouche@flagbit.de>
Fri, 4 Nov 2011 09:32:09 +0000 (10:32 +0100)
committerErnesto Baschny <ernst@cron-it.de>
Wed, 23 Oct 2013 18:39:38 +0000 (20:39 +0200)
Through a bug introduced by #31120, an Exception is thrown when a
TypoScript FORM object should be rendered.

Fixes: #31572
Releases: 6.2, 6.1, 6.0, 4.7
Change-Id: Ie67484fd014620ea229a7bee8bfebd063a3b57ae
Reviewed-on: https://review.typo3.org/23717
Reviewed-by: Stefan Neufeind
Reviewed-by: Sebastian Michaelsen
Reviewed-by: Ernesto Baschny
Tested-by: Ernesto Baschny
typo3/sysext/form/Classes/Controller/FormController.php

index ed14418..32833bc 100644 (file)
@@ -104,7 +104,7 @@ class FormController {
                        }
                        $newTypoScript = array(
                                '10' => 'FORM_INT',
-                               '10.' => $mergedTypoScript
+                               '10.' => is_array($mergedTypoScript) ? $mergedTypoScript : $typoScript,
                        );
                        $content = $contentObject->COBJ_ARRAY($newTypoScript, 'INT');
                        // Only apply stdWrap to TypoScript that was NOT created by the wizard: