From 68937497c40778b68dbf23ba6372bda7956f6f0b Mon Sep 17 00:00:00 2001 From: Michael Stucki Date: Mon, 4 Apr 2005 14:49:04 +0000 Subject: [PATCH] * Unfortunately the resolve-path patch was overwritten, so here it is again git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@598 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 11 ++++++++--- typo3/class.alt_menu_functions.inc | 14 ++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 592d644e50ec..4041a155f742 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +2005-04-04 Michael Stucki + + * Unfortunately the resolve-path patch was overwritten, so here it is again + 2005-04-04 Robert Lemke - + Added a preliminary way for moving containers in a flexform section in TCEforms + TCEmain. Before you could only delete containers. - + Added Sebastian Kurfürst's collapsable modules feature for the backend's module bar + + * Added a preliminary way for moving containers in a flexform section in TCEforms + TCEmain. Before you could only delete containers. + * Added Sebastian Kurfürst's collapsable modules feature for the backend's module bar 2005-04-04 Kasper Skårhøj,,, @@ -40,7 +45,7 @@ * TYPO3 seems to prefer "mediumblob" instead of "MEDIUMBLOB", thus I changed that in typo3/sysext/cms/ext_tables.sql * Added hook in tslib_fe - + 2005-03-28 Michael Stucki * Corrected a typo in fe_adminLib.inc (Ingmar watch this!) diff --git a/typo3/class.alt_menu_functions.inc b/typo3/class.alt_menu_functions.inc index 03d40acb78dc..9265789455a3 100755 --- a/typo3/class.alt_menu_functions.inc +++ b/typo3/class.alt_menu_functions.inc @@ -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 { '; } - $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.'¤tSubScript='; + $prefix=$navFrameScript.$navFrameScriptParam.'¤tSubScript='; } 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='; } } -- 2.20.1