Fixed bug #14207: Duplicate submodule URL in JavaScript

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

diff --git a/ChangeLog b/ChangeLog
index f66f367..fb11be5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-29  Dmitry Dulepov  <dmitry.dulepov@gmail.com>
+
+       * Fixed bug #14207: Duplicate submodule URL in JavaScript
+
 2010-04-27  Steffen Kamper  <info@sk-typo3.de>
 
        * Fixed bug #14230: Match TS browser condition with all delivered browsers

diff --git a/typo3/classes/class.modulemenu.php b/typo3/classes/class.modulemenu.php
index cc74486..d44be22 100644 (file)
--- a/typo3/classes/class.modulemenu.php
+++ b/typo3/classes/class.modulemenu.php
@@ -445,9 +445,8 @@ class ModuleMenu {
                                                        $submoduleNavigationFrameScript = $subModuleData['navigationFrameScript'] ? $subModuleData['navigationFrameScript'] : $subModuleData['parentNavigationFrameScript'];
                                                        $submoduleNavigationFrameScript = t3lib_div::resolveBackPath($submoduleNavigationFrameScript);
 
-                                                               // add GET parameters for sub module to the navigation script
-                                                       $submoduleNavigationFrameScript = $this->appendQuestionmarkToLink($submoduleNavigationFrameScript).$subModuleData['navigationFrameScript'];
                                                        $navFrameScripts[$parentModuleName] = $submoduleNavigationFrameScript;
+
                                                        $javascriptCommand = '
                                top.currentSubScript = "'.$subModuleData['originalLink'].'";
                                if (top.content.list_frame && top.fsMod.currentMainLoaded == mainModName) {