Index: branches/5.2.x/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r15906 -r16339
--- branches/5.2.x/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 15906)
+++ branches/5.2.x/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 16339)
@@ -24,7 +24,7 @@
 	  				$(document).ready(
 	  					function() {
 	  						Application.SetVar('continue', 1);
-	  						openSelector('c', '<inp2:m_t t="categories/cache_updater" pass="m"/>');
+	  						openSelector('c', '<inp2:m_t t="categories/cache_updater" pass="m" no_amp="1" js_escape="1"/>');
 	  					}
 	  				);
 	  			</inp2:m_if>
@@ -35,7 +35,7 @@
 
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 	  			var $is_catalog = true;
-	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_', 'Catalog');
+	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1" js_escape="1"/>', 'catalog_', 'Catalog');
 				$Catalog.TabByCategory = <inp2:m_if check="m_GetConfig" name="Catalog_PreselectModuleTab">true<inp2:m_else/>false</inp2:m_if>;
 
 				var a_toolbar = new ToolBar();
@@ -220,7 +220,7 @@
 				function executeButton($button_name) {
 					switch ($button_name) {
 						case 'editcat':
-							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
+							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1" js_escape="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
 							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id == 0 || $category_id == <inp2:c_HomeCategory/> ? 'categories/categories_edit_permissions' : 'categories/categories_edit');
@@ -241,7 +241,7 @@
 							break;
 
 						case 'rebuild_cache':
-							openSelector('c', '<inp2:m_t t="categories/cache_updater" pass="m"/>');
+							openSelector('c', '<inp2:m_t t="categories/cache_updater" pass="m" no_amp="1" js_escape="1"/>');
 							break;
 
 						case 'recalculate_priorities':
@@ -290,7 +290,7 @@
 	var $menu_frame = getFrame('menu');
 	if (typeof $menu_frame.ShowStructure != 'undefined') {
 		<inp2:m_DefineElement name="structure_node"><inp2:m_param name="section_url"/></inp2:m_DefineElement>
-		$menu_frame.ShowStructure('<inp2:adm_PrintSection js_escape="1" render_as="structure_node" section_name="in-portal:browse"/>', true);
+		$menu_frame.ShowStructure('<inp2:adm_PrintSection render_as="structure_node" section_name="in-portal:browse" js_escape="1"/>', true);
 	}
 
 	Application.setHook(