### Eclipse Workspace Patch 1.0
#P TYPO3_4-3
Index: typo3/classes/class.modulemenu.php
===================================================================
--- typo3/classes/class.modulemenu.php	(revision 6918)
+++ typo3/classes/class.modulemenu.php	(working copy)
@@ -450,6 +450,12 @@
 				top.currentSubScript = "'.$subModuleData['originalLink'].'";
 				if (top.content.list_frame && top.fsMod.currentMainLoaded == mainModName) {
 					modScriptURL = "'.$this->appendQuestionmarkToLink($subModuleData['originalLink']).'"'.$additionalJavascript.';
+					';
+								// Change link to navigation frame if submodule has it's own navigation
+							if ($submoduleNavigationFrameScript) {
+					$javascriptCommand .= 'navFrames["' . $parentModuleName . '"] = "'. $submoduleNavigationFrameScript . '";';
+							}
+							$javascriptCommand .= '
 				} else if (top.nextLoadModuleUrl) {
 					modScriptURL = "'.($subModuleData['prefix'] ? $this->appendQuestionmarkToLink($subModuleData['link']) . '&exScript=' : '') . 'listframe_loader.php";
 				} else {
@@ -478,7 +484,17 @@
 		var additionalGetVariables = "";
 		if (addGetVars)	{
 			additionalGetVariables = addGetVars;
+		}';
+		
+		
+		$javascriptCode .= '
+		var navFrames = {};';
+		foreach ($navFrameScripts as $mainMod => $frameScript) {
+			$javascriptCode .= '
+		navFrames["'.$mainMod.'"] = "'.$frameScript.'";';
 		}
+		
+		$javascriptCode .= '		
 
 		var cMR = (cMR_flag ? 1 : 0);
 		var modScriptURL = "";
@@ -486,12 +502,8 @@
 		switch(modName)	{'
 			."\n".implode("\n", $moduleJavascriptCommands)."\n".'
 		}
-
-		var navFrames = {};';
-		foreach ($navFrameScripts as $mainMod => $frameScript) {
-			$javascriptCode .= '
-		navFrames["'.$mainMod.'"] = "'.$frameScript.'";';
-		}
+		';
+		
 		$javascriptCode .= '
 
 		if (!useCondensedMode && navFrames[mainModName]) {