Index: branches/5.2.x/core/admin_templates/browser/browser_header.tpl
===================================================================
diff -u -N -r14572 -r15323
--- branches/5.2.x/core/admin_templates/browser/browser_header.tpl	(.../browser_header.tpl)	(revision 14572)
+++ branches/5.2.x/core/admin_templates/browser/browser_header.tpl	(.../browser_header.tpl)	(revision 15323)
@@ -31,7 +31,7 @@
 var $use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>;
 var $modal_windows = <inp2:m_if check="adm_UsePopups" mode="modal">true<inp2:m_else/>false</inp2:m_if>;
 var multiple_windows = '1';
-var main_title = '<inp2:m_GetConfig var="Site_Name" escape="1"/>';
+var main_title = '<inp2:m_GetConfig var="Site_Name" js_escape="1"/>';
 var tpl_changed = 0;
 var base_url = '<inp2:m_BaseURL/>';
 var $base_path = '<inp2:m_GetConst name="BASE_PATH"/>';
Index: branches/5.2.x/core/admin_templates/incs/header.tpl
===================================================================
diff -u -N -r15284 -r15323
--- branches/5.2.x/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 15284)
+++ branches/5.2.x/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 15323)
@@ -58,7 +58,7 @@
 var $use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>;
 var $modal_windows = <inp2:m_if check="adm_UsePopups" mode="modal">true<inp2:m_else/>false</inp2:m_if>;
 var multiple_windows = '1';
-var main_title = '<inp2:m_GetConfig var="Site_Name" escape="1"/>';
+var main_title = '<inp2:m_GetConfig var="Site_Name" js_escape="1"/>';
 var tpl_changed = 0;
 var base_url = '<inp2:m_BaseURL/>';
 var $base_path = '<inp2:m_GetConst name="BASE_PATH"/>';
Index: branches/5.2.x/core/admin_templates/tree.tpl
===================================================================
diff -u -N -r15173 -r15323
--- branches/5.2.x/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 15173)
+++ branches/5.2.x/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 15323)
@@ -47,9 +47,9 @@
 		<td colspan="2" style="vertical-align: top; padding: 5px;">
 			<inp2:m_DefineElement name="xml_node" icon_module="">
 				<inp2:m_if check="m_ParamEquals" param="children_count" value="0">
-					<item href="<inp2:m_param name="section_url" js_escape="1"/>" priority="<inp2:m_param name="priority"/>" onclick="<inp2:m_param name="onclick" js_escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.png"<inp2:m_if check="m_Param" name="debug_only"> debug_only="1"</inp2:m_if>><inp2:m_phrase name="$label" escape="1"/></item>
+					<item href="<inp2:m_param name='section_url' js_escape='1'/>" priority="<inp2:m_param name='priority'/>" onclick="<inp2:m_param name='onclick' js_escape='1'/>" icon="<inp2:$SectionPrefix_ModulePath module='$icon_module'/>img/icons/icon24_<inp2:m_param name='icon'/>.png"<inp2:m_if check="m_Param" name="debug_only"> debug_only="1"</inp2:m_if>><inp2:m_phrase name="$label" escape="1"/></item>
 				<inp2:m_else/>
-					<folder href="<inp2:m_param name="section_url" js_escape="1"/>" priority="<inp2:m_param name="priority"/>" container="<inp2:m_param name="container"/>" onclick="<inp2:m_param name="onclick" js_escape="1"/>" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.png" load_url="<inp2:m_param name="late_load" js_escape="1"/>"<inp2:m_if check="m_Param" name="debug_only"> debug_only="1"</inp2:m_if>><inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/></folder>
+					<folder href="<inp2:m_param name='section_url' js_escape='1'/>" priority="<inp2:m_param name='priority'/>" container="<inp2:m_param name='container'/>" onclick="<inp2:m_param name='onclick' js_escape='1'/>" name="<inp2:m_phrase name='$label' escape='1'/>" icon="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name='icon'/>.png" load_url="<inp2:m_param name='late_load' js_escape='1'/>"<inp2:m_if check="m_Param" name="debug_only"> debug_only="1"</inp2:m_if>><inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/></folder>
 				</inp2:m_if>
 			</inp2:m_DefineElement>
 
@@ -66,7 +66,7 @@
 				};
 
 				<inp2:m_DefineElement name="root_node">
-					var the_tree = new TreeFolder('tree', '<inp2:m_param name="label"/>', '<inp2:m_param name="section_url"/>', '<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.png', null, null, '<inp2:m_param name="priority"/>', '<inp2:m_param name="container"/>');
+					var the_tree = new TreeFolder('tree', '<inp2:m_param name="label" js_escape="1"/>', '<inp2:m_param name="section_url" js_escape="1"/>', '<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.png', null, null, '<inp2:m_param name="priority"/>', '<inp2:m_param name="container"/>');
 				</inp2:m_DefineElement>
 				<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root"/>
 
Index: branches/5.2.x/core/admin_templates/login.tpl
===================================================================
diff -u -N -r15247 -r15323
--- branches/5.2.x/core/admin_templates/login.tpl	(.../login.tpl)	(revision 15247)
+++ branches/5.2.x/core/admin_templates/login.tpl	(.../login.tpl)	(revision 15323)
@@ -103,13 +103,13 @@
 			  		<table class="head-table" style="background: none;">
 			  		<tr>
 			  			<inp2:m_if check="adm_AdminSkin" type="LogoLogin">
-			  				<td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_GetConfig var='Site_Name'/>"></td>
+			  				<td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>"></td>
 			  			<inp2:m_else/>
 			  				<inp2:m_if check="adm_AdminSkin" type="Logo">
 				  				<td>
-				  					<img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_GetConfig var='Site_Name'/>"><br/>
+				  					<img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>"><br/>
 				  					<inp2:m_if check="adm_AdminSkin" type="LogoBottom">
-				  						<img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="<inp2:m_GetConfig var='Site_Name'/>">
+				  						<img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>">
 				  					</inp2:m_if>
 				  				</td>
 			  				</inp2:m_if>