Index: branches/RC/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -r9544 -r9551
--- branches/RC/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 9544)
+++ branches/RC/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 9551)
@@ -45,37 +45,35 @@
 
 				        	window.onload = function() {
 				        	 	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" js_escape="1"/>');
-					        	<inp2:m_Set m_cat_id="$current_category"/>
-										<inp2:c_Field requery="1" name="Name" result_to_var="category_name"/>
 
 					        	menu_mgr.renderMenus();
 					        	menu_mgr.renderMenubar('xmlMenuDiv');
 				        	};
 				        </script>
 				        <noscript>
-
-				        <inp2:m_get name="m_cat_id" result_to_var="current_category"/>
-
 				        	<inp2:m_DefineElement name="static_menu_element">
 				        		<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
-										<inp2:m_Random result_to_var="rand"/>
-										<inp2:m_Set m_cat_id="$root_cat"/>
-										<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root" result_to_var="link"/>
-										<inp2:m_TemplatesBase module="$module" result_to_var="module_path"/>
-										<inp2:c_Field requery="1" name="Name" result_to_var="title"/>
-										<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/{$icon}"/>
-									</inp2:m_DefineElement>
+								<inp2:m_Random result_to_var="rand"/>
+								<inp2:m_Set m_cat_id="$root_cat"/>
+								<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root" result_to_var="link"/>
+								<inp2:m_TemplatesBase module="$module" result_to_var="module_path"/>
+								<inp2:c_Field requery="1" name="Name" result_to_var="title"/>
+								<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/{$icon}"/>
+							</inp2:m_DefineElement>
 
-									<table><tr>
+							<table>
+								<tr>
 									<inp2:m_Link template="index" m_cat_id="0" result_to_var="link"/>
 									<inp2:m_RootCategoryName result_to_var="title"/>
 									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
 									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif" />
-
-				        	<inp2:m_ModuleInclude template="elements/static_menu" />
-				        	</tr></table>
-									<inp2:m_Set m_cat_id="$current_category"/>
+				        			<inp2:m_ModuleInclude template="elements/static_menu" />
+								</tr>
+							</table>
 				        </noscript>
+
+				        <inp2:m_Set m_cat_id="$current_category"/>
+						<inp2:c_Field requery="1" name="Name" result_to_var="category_name"/>
 					</td>
 				</tr>
 			</table>