Fixed bug #5655: TYPO3 back-end was blocked on new installations because of a bug...
authorOliver Hader <oliver.hader@typo3.org>
Fri, 25 May 2007 06:03:22 +0000 (06:03 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Fri, 25 May 2007 06:03:22 +0000 (06:03 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2349 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/alt_main.php

index 3b5569b..74a786c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-25  Oliver Hader  <oh@inpublica.de>
+
+       * Fixed bug #5655: TYPO3 back-end was blocked on new installations because of a bug in RFCs #1642/#4886
+
 2007-05-23  Oliver Hader  <oh@inpublica.de>
 
        * Fixed bug #5564: IRRE - foreign_selector/foreign_unique on click issue
index 3ce3ba3..8e645a2 100755 (executable)
@@ -122,7 +122,7 @@ class SC_alt_main {
                $pageModule = t3lib_BEfunc::isModuleSetInTBE_MODULES($newPageModule) ? $newPageModule : 'web_layout';
 
                $menuFrameName = 'menu';
-               if ($GLOBALS['BE_USER']->uc['noMenuMode'] == 'icons') {
+               if ($GLOBALS['BE_USER']->uc['noMenuMode'] === 'icons') {
                        $menuFrameName = 'topmenuFrame';
                }
 
@@ -339,8 +339,12 @@ class SC_alt_main {
         */
        var currentModuleLoaded = "";
        function goToModule(modName, cMR_flag, addGetVars)      {       //
-               currentModuleLoaded = modName;
-               top.'.$menuFrameName.'.goToModule(modName, cMR_flag, addGetVars);
+               if (top.'.$menuFrameName.' && top.'.$menuFrameName.'.goToModule) {
+                       currentModuleLoaded = modName;
+                       top.'.$menuFrameName.'.goToModule(modName, cMR_flag, addGetVars);
+               } else {
+                       window.setTimeout(function() { top.goToModule(modName, cMR_flag, addGetVars); }, 500);
+               }
        }
 
        /**
@@ -454,7 +458,7 @@ class SC_alt_main {
                if ($module) {
                        $this->mainJScode.='
                // open in module:
-       window.setTimeout("top.goToModule(\''.$module.'\',false,\''.$params.'\');",1000);
+       top.goToModule(\''.$module.'\',false,\''.$params.'\');
                        ';
                }
        }