Fixed bug #14026: Main module does not load different navFrames in submodules in...
authorDmitry Dulepov <dmitry.dulepov@gmail.com>
Thu, 29 Apr 2010 12:20:54 +0000 (12:20 +0000)
committerDmitry Dulepov <dmitry.dulepov@gmail.com>
Thu, 29 Apr 2010 12:20:54 +0000 (12:20 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7447 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/classes/class.modulemenu.php

index fb11be5..7e3fe4c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-04-29  Dmitry Dulepov  <dmitry.dulepov@gmail.com>
 
        * Fixed bug #14207: Duplicate submodule URL in JavaScript
+       * Fixed bug #14026: Main module does not load different navFrames in submodules in dependency of navFrameScriptParam
 
 2010-04-27  Steffen Kamper  <info@sk-typo3.de>
 
index d44be22..fdd85c9 100644 (file)
@@ -290,6 +290,7 @@ class ModuleMenu {
                                                'prefix'       => $submoduleNavigationFramePrefix,
                                                'description'  => $submoduleDescription,
                                                'navigationFrameScript' => $submoduleData['navFrameScript'],
+                                               'navigationFrameScriptParam' => $submoduleData['navFrameScriptParam']
                                        );
 
                                        if($moduleData['navFrameScript']) {
@@ -445,6 +446,11 @@ class ModuleMenu {
                                                        $submoduleNavigationFrameScript = $subModuleData['navigationFrameScript'] ? $subModuleData['navigationFrameScript'] : $subModuleData['parentNavigationFrameScript'];
                                                        $submoduleNavigationFrameScript = t3lib_div::resolveBackPath($submoduleNavigationFrameScript);
 
+                                                               // Add navigation script parameters if module requires them
+                                                       if ($subModuleData['navigationFrameScriptParam']) {
+                                                               $submoduleNavigationFrameScript = $this->appendQuestionmarkToLink($submoduleNavigationFrameScript) . $subModuleData['navigationFrameScriptParam'];
+                                                       }
+
                                                        $navFrameScripts[$parentModuleName] = $submoduleNavigationFrameScript;
 
                                                        $javascriptCommand = '