Fixed bug #8701: Bug: options.moduleMenuCollapsable = 0 doesn't have any effect

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5436 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index e7d4a68..32f3ec8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-18  Steffen Kamper  <info@sk-typo3.de>
+
+       * Fixed bug #8701: Bug: options.moduleMenuCollapsable = 0 doesn't have any effect
+
 2009-05-18  Ernesto Baschny  <ernst@cron-it.de>
 
        * Fixed bug #11094: CSC: maxWInText setting was being ignored (since #10320).

diff --git a/typo3/classes/class.modulemenu.php b/typo3/classes/class.modulemenu.php
index 310ce5f..701f9d4 100644 (file)
--- a/typo3/classes/class.modulemenu.php
+++ b/typo3/classes/class.modulemenu.php
@@ -133,6 +133,9 @@ class ModuleMenu {
                $menu    = '';
                $onBlur  = $GLOBALS['CLIENT']['FORMSTYLE'] ? 'this.blur();' : '';
 
+               $tsConfiguration = $GLOBALS['BE_USER']->getTSConfig('options.moduleMenuCollapsable');
+               $collapsable = (isset($tsConfiguration['value']) && $tsConfiguration['value'] == 0) ? 0 : 1;
+               
                $rawModuleData = $this->getRawModuleData();
 
                foreach($rawModuleData as $moduleKey => $moduleData) {
@@ -143,7 +146,11 @@ class ModuleMenu {
                                $moduleLabel = '<a href="#" onclick="top.goToModule(\''.$moduleData['name'].'\');'.$onBlur.'return false;">'.$moduleLabel.'</a>';
                        }
 
-                       $menu .= '<li id="modmenu_' . $moduleData['name'] . '" class="menuSection" title="' . $moduleData['description'] . '"><div class="' . ($menuState ? 'collapsed' : 'expanded') . '">' . $moduleData['icon']['html'] . ' ' . $moduleLabel . '</div>';
+                       $menu .= '<li id="modmenu_' . $moduleData['name'] . '" '.
+                               ($collapsable ? 'class="menuSection"' : '') .
+                               ' title="' . $moduleData['description'] . '">
+                               <div class="' . ($menuState ? 'collapsed' : 'expanded') . '">' .
+                               $moduleData['icon']['html'] . ' ' . $moduleLabel . '</div>';
 
                                // traverse submodules
                        if(is_array($moduleData['subitems'])) {