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

ChangeLog
typo3/classes/class.modulemenu.php

index 422e66c..bef6dcd 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-13  Dmitry Dulepov  <dmitry.dulepov@gmail.com>
 
index 90e0068..2a5698e 100644 (file)
@@ -296,6 +296,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'];
+                                                       }
+
                                                        $javascriptCommand = '
                                if (top.content.list_frame && top.fsMod.currentMainLoaded=="'.$parentModuleName.'") {
                                        top.currentSubScript="'.$subModuleData['originalLink'].'";
@@ -556,4 +562,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/classes/class.modulemenu.php']);
 }
 
-?>
\ No newline at end of file
+?>