From: Dmitry Dulepov Date: Mon, 29 Oct 2007 08:28:15 +0000 (+0000) Subject: Fixed bug #6581: Fatal error in TCEForms: Fatal error: Cannot use string offset as... X-Git-Tag: TYPO3_4-2-0alpha2~83 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/2478ae478543c8b9a10f3c6f309372fb39c312c2?hp=c081e809f2da833fbc4d034c94d2db456f31958e Fixed bug #6581: Fatal error in TCEForms: Fatal error: Cannot use string offset as an array Fixed bug #6565: T3DataStructure with sheet references will not show sheetTitle,sheetDescription and sheetShortDescr Fixed bug #5347: Flexforms dosen't resolve sheets Fixed bug #3969: Missing sheets inclusion in flexforms? git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2633 709f56b5-9817-0410-a4d7-c38de5d9e867 --- diff --git a/ChangeLog b/ChangeLog index 8a7a5757e0c7..97d2be3a58e5 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-29 Dmitry Dulepov + + * Fixed bug #6581: Fatal error in TCEForms: Fatal error: Cannot use string offset as an array + * Fixed bug #6565: T3DataStructure with sheet references will not show sheetTitle,sheetDescription and sheetShortDescr + * Fixed bug #5347: Flexforms dosen't resolve sheets + * Fixed bug #3969: Missing sheets inclusion in flexforms? + 2007-10-28 Kasper SkŒrh¿j * - Reverting IRRE related changes in t3lib_BEfunc done for workspaces by Dmitry. They were faulty. diff --git a/t3lib/class.t3lib_tceforms.php b/t3lib/class.t3lib_tceforms.php index 38bbc2523b2f..154e2d537f05 100755 --- a/t3lib/class.t3lib_tceforms.php +++ b/t3lib/class.t3lib_tceforms.php @@ -2245,7 +2245,6 @@ class t3lib_TCEforms { $tabParts = array(); foreach ($tabsToTraverse as $sheet) { - $sheetCfg = $dataStructArray['sheets'][$sheet]; list ($dataStruct, $sheet) = t3lib_div::resolveSheetDefInDS($dataStructArray,$sheet); // Render sheet: @@ -2273,9 +2272,9 @@ class t3lib_TCEforms { // Add to tab: $tabParts[] = array( - 'label' => ($sheetCfg['ROOT']['TCEforms']['sheetTitle'] ? $this->sL($sheetCfg['ROOT']['TCEforms']['sheetTitle']) : $sheet), - 'description' => ($sheetCfg['ROOT']['TCEforms']['sheetDescription'] ? $this->sL($sheetCfg['ROOT']['TCEforms']['sheetDescription']) : ''), - 'linkTitle' => ($sheetCfg['ROOT']['TCEforms']['sheetShortDescr'] ? $this->sL($sheetCfg['ROOT']['TCEforms']['sheetShortDescr']) : ''), + 'label' => ($dataStruct['ROOT']['TCEforms']['sheetTitle'] ? $this->sL($dataStruct['ROOT']['TCEforms']['sheetTitle']) : $sheet), + 'description' => ($dataStruct['ROOT']['TCEforms']['sheetDescription'] ? $this->sL($dataStruct['ROOT']['TCEforms']['sheetDescription']) : ''), + 'linkTitle' => ($dataStruct['ROOT']['TCEforms']['sheetShortDescr'] ? $this->sL($dataStruct['ROOT']['TCEforms']['sheetShortDescr']) : ''), 'content' => $sheetContent ); }