* Unfortunately the resolve-path patch was overwritten, so here it is again
[Packages/TYPO3.CMS.git] / typo3 / class.alt_menu_functions.inc
index 03d40ac..9265789 100755 (executable)
@@ -172,6 +172,8 @@ class alt_menu_functions {
                                $link_sub = 0;
                        }
 
+                       $link = t3lib_div::resolveBackPath($link);
+
                        $moduleKey = $moduleName.'_tab';
                        $moduleCSSId = 'ID_'.t3lib_div::md5int($moduleName);
 
@@ -248,7 +250,7 @@ class alt_menu_functions {
                                                                </tr>';
                                        }
 
-                                       $link = $subInfo['script'];
+                                       $link = t3lib_div::resolveBackPath($subInfo['script']);
                                        $prefix=$this->getNavFramePrefix ($moduleInfo, $subInfo);
 
                                        $subKey = $moduleName.'_'.$subName.'_tab';
@@ -292,7 +294,8 @@ class alt_menu_functions {
                                                if (!$BE_USER->uc['condensedMode'] && $moduleInfo['navFrameScript'])    {
 
                                                                // use special nav script from sub module, otherwise from the main module
-                                                       $subNavFrameScript = $subInfo['navFrameScript'] ? $subInfo['navFrameScript'] : $moduleInfo['navFrameScript'] ;
+                                                       $subNavFrameScript = $subInfo['navFrameScript'] ? $subInfo['navFrameScript'] : $moduleInfo['navFrameScript'];
+                                                       $subNavFrameScript = t3lib_div::resolveBackPath($subNavFrameScript);
 
                                                                // add GET params for sub module to the nav script
                                                        $subNavFrameScript = $this->wrapLinkWithAB($subNavFrameScript).$subInfo['navFrameScriptParam'];
@@ -468,12 +471,15 @@ class alt_menu_functions {
                $prefix = '';
                $navFrameScriptParam = $subModuleInfo['navFrameScriptParam'] ? $subModuleInfo['navFrameScriptParam'] : $moduleInfo['navFrameScriptParam'];
                if ($moduleInfo['navFrameScript'])      {
+                       $navFrameScript = t3lib_div::resolveBackPath($moduleInfo['navFrameScript']);
+                       $navFrameScript = $this->wrapLinkWithAB($navFrameScript);
+
                        if ($BE_USER->uc['condensedMode'])      {
-                               $prefix=$this->wrapLinkWithAB($moduleInfo['navFrameScript']).$navFrameScriptParam.'&currentSubScript=';
+                               $prefix=$navFrameScript.$navFrameScriptParam.'&currentSubScript=';
                        } else {
                                $prefix='alt_mod_frameset.php?'.
                                        'fW="+top.TS.navFrameWidth+"'.
-                                       '&nav="+top.TS.PATH_typo3+"'.rawurlencode($this->wrapLinkWithAB($moduleInfo['navFrameScript']).$navFrameScriptParam).
+                                       '&nav="+top.TS.PATH_typo3+"'.rawurlencode($navFrameScript.$navFrameScriptParam).
                                        '&script=';
                        }
                }