Fixed bug #6581: Fatal error in TCEForms: Fatal error: Cannot use string offset as...

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 8a7a575..97d2be3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-29     Dmitry Dulepov  <dmitry@typo3.org>
+
+       * 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\8crh¿j  <kasperYYYY@typo3.com>
        
        * - 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 38bbc25..154e2d5 100755 (executable)
--- 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
                                        );
                                }