Index: branches/5.2.x/core/admin_templates/incs/header.tpl
===================================================================
diff -u -N -r16415 -r16603
--- branches/5.2.x/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 16415)
+++ branches/5.2.x/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 16603)
@@ -54,7 +54,7 @@
 <script type="text/javascript">
 TB.pathToImage = 'js/jquery/thickbox/loadingAnimation.gif';
 
-var	t = '<inp2:m_get param="t"/>',
+var	t = '<inp2:m_get param="t" js_escape="1"/>',
 	popups = '1',
 	$use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>,
 	$modal_windows = <inp2:m_if check="adm_UsePopups" mode="modal">true<inp2:m_else/>false</inp2:m_if>,
@@ -74,8 +74,8 @@
 NumberFormatter.DecimalSep = '<inp2:lang.current_Field name="DecimalPoint" js_escape="1"/>';
 
 <inp2:m_if check="m_GetEquals" name="m_wid" value="" inverse="inverse">
-	if (!window.name.match(/_<inp2:m_get name="m_wid"/>$/)) {
-		window.name += '_<inp2:m_get name="m_wid"/>'; // change window name only once per window
+	if (!window.name.match(/_<inp2:m_get name="m_wid" js_escape="1"/>$/)) {
+		window.name += '_<inp2:m_get name="m_wid" js_escape="1"/>'; // change window name only once per window
 
 		if ($modal_windows) {
 			getFrame('main').TB.setWindowMetaData('window_name', window.name); // used to simulate window.opener functionality
@@ -121,4 +121,4 @@
 
 <inp2:m_if check="m_ParamEquals" name="noform" value="yes" inverse="inverse">
 	<inp2:m_RenderElement name="kernel_form"/>
-</inp2:m_if>
\ No newline at end of file
+</inp2:m_if>
Index: branches/5.2.x/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -N -r16062 -r16603
--- branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 16603)
@@ -168,7 +168,7 @@
 
 	<inp2:m_if check="m_Get" name="first_error">
 		$(document).ready(function () {
-			var $error_cell = $('.field-<inp2:m_Get name="first_error"/>.error');
+			var $error_cell = $('.field-<inp2:m_Get name="first_error" js_escape="1"/>.error');
 
 			if ( $error_cell.length ) {
 				$(window).scrollTop($error_cell.position().top - 15);
Index: branches/5.2.x/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl
===================================================================
diff -u -N -r14916 -r16603
--- branches/5.2.x/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 14916)
+++ branches/5.2.x/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 16603)
@@ -29,7 +29,7 @@
 						set_hidden_field('selected_ids[c]', $category_ids);
 					}
 				<inp2:m_else/>
-					var $prefix = $Catalog.ActivePrefix.replace('.<inp2:m_get name="ts"/>', '');
+					var $prefix = $Catalog.ActivePrefix.replace('.<inp2:m_get name="ts" js_escape="1"/>', '');
 					set_hidden_field('selected_ids[' + $prefix + ']', Grids[$Catalog.ActivePrefix].GetSelected());
 				</inp2:m_if>
 
@@ -75,4 +75,4 @@
 	{
 
 	}
-</script>
\ No newline at end of file
+</script>
Index: branches/5.2.x/core/admin_templates/categories/categories_edit_related_searches.tpl
===================================================================
diff -u -N -r14244 -r16603
--- branches/5.2.x/core/admin_templates/categories/categories_edit_related_searches.tpl	(.../categories_edit_related_searches.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/categories/categories_edit_related_searches.tpl	(.../categories_edit_related_searches.tpl)	(revision 16603)
@@ -117,5 +117,5 @@
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
-	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
-</script>
\ No newline at end of file
+	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id" js_escape="1"/>-1-1-1-s';
+</script>
Index: branches/5.2.x/core/admin_templates/catalog/advanced_view.tpl
===================================================================
diff -u -N -r16339 -r16603
--- branches/5.2.x/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 16339)
+++ branches/5.2.x/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 16603)
@@ -138,12 +138,12 @@
 		function() {
 			$Catalog.Init();
 			<inp2:m_if check="m_get" var="SetTab">
-				$Catalog.switchTab('<inp2:m_get var="SetTab"/>.showall');
+				$Catalog.switchTab('<inp2:m_get var="SetTab" js_escape="1"/>.showall');
 			</inp2:m_if>
 
 			getFrame('head').$('#extra_toolbar').html('<inp2:m_RenderElement name="extra_toolbar" js_escape="1"/>');
 		}
 	);
 </script>
 
-<inp2:m_include t="incs/footer" noform="yes"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer" noform="yes"/>
Index: branches/5.2.x/core/admin_templates/categories/categories_edit_relations.tpl
===================================================================
diff -u -N -r16339 -r16603
--- branches/5.2.x/core/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 16339)
+++ branches/5.2.x/core/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 16603)
@@ -103,5 +103,5 @@
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
-	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
-</script>
\ No newline at end of file
+	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id" js_escape="1"/>-1-1-1-s';
+</script>
Index: branches/5.2.x/core/admin_templates/languages/phrase_list.tpl
===================================================================
diff -u -N -r15116 -r16603
--- branches/5.2.x/core/admin_templates/languages/phrase_list.tpl	(.../phrase_list.tpl)	(revision 15116)
+++ branches/5.2.x/core/admin_templates/languages/phrase_list.tpl	(.../phrase_list.tpl)	(revision 16603)
@@ -10,7 +10,7 @@
 				//do not rename - this function is used in default grid for double click!
 				function edit()
 				{
-					Application.SetVar('m_lang', '<inp2:m_Get name="m_lang"/>');
+					Application.SetVar('m_lang', '<inp2:m_Get name="m_lang" js_escape="1"/>');
 					std_edit_item('phrases', 'languages/phrase_edit');
 				}
 
@@ -53,4 +53,4 @@
 	Grids['phrases'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r16339 -r16603
--- branches/5.2.x/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16339)
+++ branches/5.2.x/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16603)
@@ -52,7 +52,7 @@
 
 		<inp2:m_DefineElement name="page_browse_td" format="">
 			<inp2:m_if check="m_Get" name="type" equals_to="item_selector">
-				<a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');" title="<inp2:m_Phrase name='la_alt_GoInside' html_escape='1'/>"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
+				<a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id" js_escape="1"/>, '<inp2:GetModulePrefix/>');" title="<inp2:m_Phrase name='la_alt_GoInside' html_escape='1'/>"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
 			<inp2:m_else/>
 				<a href="<inp2:ItemEditLink/>" title="<inp2:m_Phrase name='la_Text_Edit' no_editing='1'/>" onclick="return direct_edit('<inp2:m_param name="PrefixSpecial"/>', this.href);"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
 			</inp2:m_if>
Index: branches/5.2.x/core/admin_templates/reviews/reviews.tpl
===================================================================
diff -u -N -r16339 -r16603
--- branches/5.2.x/core/admin_templates/reviews/reviews.tpl	(.../reviews.tpl)	(revision 16339)
+++ branches/5.2.x/core/admin_templates/reviews/reviews.tpl	(.../reviews.tpl)	(revision 16603)
@@ -108,7 +108,7 @@
 
 <inp2:m_if check="m_get" var="SetTab">
 <script type="text/javascript">
-	$Catalog.switchTab('<inp2:m_get var="SetTab"/>-rev');
+	$Catalog.switchTab('<inp2:m_get var="SetTab" js_escape="1"/>-rev');
 </script>
 </inp2:m_if>
 
@@ -120,4 +120,4 @@
 	);
 </script>
 
-<inp2:m_include t="incs/footer" noform="yes"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer" noform="yes"/>
Index: branches/5.2.x/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r16570 -r16603
--- branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16570)
+++ branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16603)
@@ -141,7 +141,7 @@
 
 	<inp2:m_if check="m_Get" name="first_error">
 		$(document).ready(function () {
-			var $error_cell = $('.field-<inp2:m_Get name="first_error"/>.error');
+			var $error_cell = $('.field-<inp2:m_Get name="first_error" js_escape="1"/>.error');
 
 			if ( $error_cell.length ) {
 				$(window).scrollTop($error_cell.position().top - 15);