Index: branches/5.3.x/core/admin_templates/head.tpl
===================================================================
diff -u -N -r15677 -r15974
--- branches/5.3.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 15677)
+++ branches/5.3.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 15974)
@@ -5,7 +5,7 @@
 <inp2:m_Set skip_last_template="1"/>
 
 <script type="text/javascript">
-	$popup_manager = new AjaxPopupManager('<inp2:m_Link template="index" js_escape="1"/>');
+	$popup_manager = new AjaxPopupManager('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');
 	grid_widths_cache = new Array();
 </script>
 
@@ -22,7 +22,7 @@
 		<table class="head-table" style="width: 100%;" cellpadding="0" cellspacing="0">
 			<td style="height: 95px; text-align: left;">
 				<div class="layout" style="top: 0px; left: 0px; vertical-align: top;">
-					<a href="<inp2:adm_PrintSection render_as='root_node' section_name='in-portal:browse_site'/>" target="main">
+					<a href="<inp2:adm_PrintSection render_as='root_node' section_name='in-portal:browse_site' html_escape='1'/>" target="main">
 						<img src="<inp2:adm_AdminSkin type='logo'/>" alt="" border="0"/>
 					</a>
 				</div>
@@ -50,7 +50,7 @@
 					</a>##-->
 
 					<inp2:m_if check="adm_AdminSkin" type="DisplaySiteNameInHeader">
-						<a href="<inp2:adm_PrintSection render_as='root_node' section_name='in-portal:browse_site'/>" target="main">
+						<a href="<inp2:adm_PrintSection render_as='root_node' section_name='in-portal:browse_site' html_escape='1'/>" target="main">
 							<inp2:m_GetConfig var="Site_Name"/>
 						</a>
 					</inp2:m_if>
@@ -81,10 +81,10 @@
 							<td class="kx-block-header" style="background-image: none;">
 								<inp2:m_phrase name="la_Logged_in_as"/> <strong><a href="javascript:change_password();" class="kx-header-link"><inp2:u.current_LoginName/></strong></a>
 								|
-								<a href="<inp2:m_t t="index" u_event="OnLogout" pass="m,u"/>" target="_parent" class="kx-header-link"><strong><inp2:m_Phrase label="la_Logout"/></strong></a>
+								<a href="<inp2:m_t t='index' u_event='OnLogout' pass='m,u'/>" target="_parent" class="kx-header-link"><strong><inp2:m_Phrase label="la_Logout"/></strong></a>
 							</td>
 							<td>
-								<a href="<inp2:m_t t="index" u_event="OnLogout" pass="m,u"/>" target="_parent"><img src="<inp2:adm_ModulePath module='core'/>img/x.gif" alt="" width="15" height="15" /></a>
+								<a href="<inp2:m_t t='index' u_event='OnLogout' pass='m,u'/>" target="_parent"><img src="<inp2:adm_ModulePath module='core'/>img/x.gif" alt="" width="15" height="15" /></a>
 							</td>
 						</tr>
 						</table>
@@ -119,7 +119,7 @@
 		</inp2:m_if>
 	}
 
-	$FrameResizer = new FrameResizer('<inp2:m_Phrase name="la_ToolTip_ShowMenu" js_escape="1"/>', '<inp2:m_Phrase name="la_ToolTip_HideMenu" js_escape="1"/>', window.parent, '<inp2:m_Link pass="m,adm" adm_event="OnSaveSetting" var_name="#NAME#" var_value="#VALUE#" no_amp="1"/>', <inp2:adm_MenuFrameWidth/>);
+	$FrameResizer = new FrameResizer('<inp2:m_Phrase name="la_ToolTip_ShowMenu" js_escape="1"/>', '<inp2:m_Phrase name="la_ToolTip_HideMenu" js_escape="1"/>', window.parent, '<inp2:m_Link pass="m,adm" adm_event="OnSaveSetting" var_name="#NAME#" var_value="#VALUE#" no_amp="1" js_escape="1"/>', <inp2:adm_MenuFrameWidth/>);
 	$FrameResizer.InitControls($FrameResizer);
 	$FrameResizer.SetStatus(<inp2:m_if check="m_RecallEquals" name="ShowAdminMenu" value="0" persistent="1">0<inp2:m_else/>1</inp2:m_if>);
 </script>
\ No newline at end of file