Index: branches/5.2.x/core/admin_templates/index.tpl
===================================================================
diff -u -N -r16293 -r16339
--- branches/5.2.x/core/admin_templates/index.tpl	(.../index.tpl)	(revision 16293)
+++ branches/5.2.x/core/admin_templates/index.tpl	(.../index.tpl)	(revision 16339)
@@ -42,7 +42,7 @@
 		 	<frameset id="sub_frameset" cols="<inp2:m_if check='m_RecallEquals' name='ShowAdminMenu' value='0' persistent='1'><inp2:adm_MenuFrameWidth/><inp2:m_else/>0</inp2:m_if>,*" border="1">
 				<frame src="<inp2:m_t t='tree' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" id="menu_frame" name="menu" target="main" scrolling="auto" marginwidth="0" marginheight="0" border="1" frameborder="1">
 				<inp2:m_DefineElement name="root_node">
-					<frame src="<inp2:m_if check='adm_MainFrameLink'><inp2:adm_MainFrameLink/><inp2:m_else/><inp2:m_param name='section_url'/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" scrolling="auto" border="1" frameborder="1">
+					<frame src="<inp2:m_if check='adm_MainFrameLink'><inp2:adm_MainFrameLink html_escape='1'/><inp2:m_else/><inp2:m_param name='section_url' html_escape='1'/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" scrolling="auto" border="1" frameborder="1">
 				</inp2:m_DefineElement>
 				<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root" use_first_child="1"/>
 			</frameset>
@@ -52,7 +52,7 @@
 		 	<frameset id="sub_frameset" cols="<inp2:m_if check='m_RecallEquals' name='ShowAdminMenu' value='0' persistent='1'><inp2:adm_MenuFrameWidth/><inp2:m_else/>0</inp2:m_if>,*" border="0">
 				<frame src="<inp2:m_t t='tree' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" id="menu_frame" name="menu" target="main" noresize scrolling="auto" marginwidth="0" marginheight="0">
 				<inp2:m_DefineElement name="root_node">
-					<frame src="<inp2:m_if check='adm_MainFrameLink'><inp2:adm_MainFrameLink/><inp2:m_else/><inp2:m_param name='section_url'/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto">
+					<frame src="<inp2:m_if check='adm_MainFrameLink'><inp2:adm_MainFrameLink html_escape='1'/><inp2:m_else/><inp2:m_param name='section_url' html_escape='1'/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto">
 				</inp2:m_DefineElement>
 				<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root" use_first_child="1"/>
 			</frameset>