Index: branches/5.2.x/core/admin_templates/categories/categories_edit_related_searches.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/categories/categories_edit_related_searches.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/categories/categories_edit_related_searches.tpl	(revision 16603)
@@ -1,121 +1,121 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" title_preset="categories_related_searches" tab_preset="Default" pagination="1" pagination_prefix="c-search"/>
 
 <inp2:m_include t="categories/categories_tabs"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('c','<inp2:c_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('c','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('c', '<inp2:c_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('c', '<inp2:c_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Keyword" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							std_new_item('c-search', 'categories/related_searches_edit')
 						} ) );
 
 				function edit()
 	  			{
 	  				std_edit_temp_item('c-search', 'categories/related_searches_edit');
 	  			}
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('c-search')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
 				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
 							submit_event('c-search','OnMassMoveUp');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
 							submit_event('c-search','OnMassMoveDown');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('c-search','OnMassApprove');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('c-search','OnMassDecline');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
 
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="c_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="c_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="c_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="c-search" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_DefineElement name="grid_keyword_td">
 	<inp2:Field field="$field" grid="$grid"/><span class="priority"><inp2:m_ifnot check="Field" field="Priority" equals_to="0"><sup><inp2:Field field="Priority" /></sup></inp2:m_ifnot></span>
 </inp2:m_DefineElement>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="c-search" IdField="RelatedSearchId" grid="Default"/>
 <script type="text/javascript">
 	Grids['c-search'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','approve','decline') );
 </script>
 <input type="hidden" name="RelatedSearchId" id="RelatedSearchId" value="<inp2:m_get name='RelatedSearchId'/>">
 <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/categories/categories_edit_relations.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/categories/categories_edit_relations.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/categories/categories_edit_relations.tpl	(revision 16603)
@@ -1,107 +1,107 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" title_preset="categories_relations" tab_preset="Default" pagination="1" pagination_prefix="c-rel"/>
 
 <inp2:m_include t="categories/categories_tabs"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('c','<inp2:c_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('c','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('c', '<inp2:c_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('c', '<inp2:c_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							openSelector('c-rel', '<inp2:adm_SelectorLink prefix="c-rel" selection_mode="single" tab_prefixes="all" no_amp="1" js_escape="1"/>', 'TargetId', '950x600');
 						} ) );
 
 				function edit()
 	  			{
 	  				std_edit_temp_item('c-rel', 'categories/relations_edit');
 	  			}
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('c-rel')
 						} ) );
 
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('c-rel','OnMassApprove');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('c-rel','OnMassDecline');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
 
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="c_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="c_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="c_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="c-rel" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="c-rel" IdField="RelationshipId" grid="Default"/>
 <script type="text/javascript">
 	Grids['c-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
 </script>
 <input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
 <input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
 <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_tab.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/catalog_tab.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/catalog_tab.tpl	(revision 16603)
@@ -1,95 +1,95 @@
 <inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
 <inp2:m_DefineElement name="catalog_tab">
 	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
 		 	a_toolbar.AddButton(
 				new ToolBarButton(
 					'new_cat',
 					'<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>',
 					add_item,
 					true
 				)
 			);
 		</inp2:m_if>
 
 		<inp2:m_if check="m_Param" name="tab_init" equals_to="2">
 			<div id="categories_div" prefix="<inp2:m_param name='prefix'/>" view_template="catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="new_cat" class="catalog-tab"><!-- IE minimal height problem fix --></div>
 			<script type="text/javascript">$Catalog.registerTab('categories');</script>
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="3">
 			$Catalog.setItemCount('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount grid="$grid_name"/>');
 		</inp2:m_if>
 	<inp2:m_else/>
 		<inp2:lang.current_SetContentType content_type="text/plain"/>
 		<inp2:m_include t="incs/blocks"/>
 		<inp2:m_include t="incs/in-portal"/>
 		<inp2:m_include t="categories/ci_blocks"/>
 
 		<inp2:m_if check="m_Param" name="prefix" equals_to="c.showall">
 			<inp2:$prefix_InitList grid="$grid_name" parent_cat_id="any"/>
 		<inp2:m_else/>
 			<inp2:$prefix_InitList grid="$grid_name"/>
 		</inp2:m_if>
 
 		// substitute form action, like from was created from here
 		document.getElementById('categories_form').action = '<inp2:m_t pass="all" no_amp="1" js_escape="1"/>';
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:$prefix_CatalogItemCount/>');
 		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_RenderElement name="structure_reload_element"/>
 
 		<inp2:m_DefineElement name="grid_parent_category_td" format="">
 			<inp2:Field name="ParentId" result_to_var="item_category" db="db"/>
 
 			<inp2:m_if check="m_Get" name="type" equals_to="item_selector">
 				<inp2:CategoryName cat_id="$item_category"/>
 			<inp2:m_else/>
 				<a href="<inp2:m_Link template='catalog/catalog' m_cat_id='$item_category' no_pass_through='1'/>"><inp2:CategoryName cat_id="$item_category"/></a>
 			</inp2:m_if>
 		</inp2:m_DefineElement>
 
 		<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>
 
 			<!--##<span class="small-statistics">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>##-->
 
 			<inp2:m_if check="BrowseModeAvailable" pass_params="1">
 				<a href="<inp2:PageBrowseLink/>" title="<inp2:m_Phrase name='la_alt_Browse' no_editing='1'/>"><img src="<inp2:m_TemplatesBase/>/img/ic_browse_mode.gif" width="8" height="7" alt="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>" border="0"/></a>
 			</inp2:m_if>
 
 			<inp2:m_if check="Field" field="Type" equals_to="2" db="db">
 				<span class="field-required" title="<inp2:m_Phrase name='la_System' no_editing='1'/>">&nbsp;*</span>
 			</inp2:m_if>
 		</inp2:m_DefineElement>
 
 		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="CategoryId" grid="$grid_name"  menu_filters="yes"/>
 		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
 
 		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
 		<inp2:m_RenderElement name="reflect_catalog_buttons"/>
 
 		<inp2:m_if check="m_Recall" name="root_delete_error">
 			alert('<inp2:m_Phrase name="la_error_RootCategoriesDelete"/>');
 			<inp2:m_RemoveVar name="root_delete_error"/>
 		</inp2:m_if>
 
 		<inp2:m_if check="adm_CheckPermCache">
 			Application.SetVar('continue', 1);
 			openSelector('c', '<inp2:m_t t="categories/cache_updater" pass="m" no_amp="1" js_escape="1"/>');
 		</inp2:m_if>
 		#separator#
 		<!-- categories tab: begin -->
 		<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 		<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="CategoryId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="kernel_form_end"/>
 		<!-- categories tab: end -->
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:c_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.2.x/core/admin_templates/reviews/reviews.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/reviews/reviews.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/reviews/reviews.tpl	(revision 16603)
@@ -1,123 +1,123 @@
 <inp2:m_include t="incs/header" noform="yes"/>
 <inp2:m_include template="catalog/catalog_elements"/>
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:reviews" prefix="c" module="in-portal" title_preset="reviews" tabs="catalog/catalog_tabs" special="-rev" skip_prefixes="m,c"/>
 
 <!-- main kernel_form: begin -->
 <inp2:m_RenderElement name="kernel_form"/>
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
 			<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress files='incs/nlsmenu.css'/>" type="text/css" />
 			<script type="text/javascript" src="<inp2:m_Compress files='
 				js/nlsmenu.js|
 				js/nlsmenueffect_1_2_1.js|
 				js/catalog.js'
 			/>"></script>
 
 	  		<script type="text/javascript">
 	  			var menuMgr = new NlsMenuManager("mgr");
 					menuMgr.timeout = 500;
 					menuMgr.flowOverFormElement = true;
 
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 
 	  			Catalog.prototype.AfterInit = function() {
 	  				this.switchTab();
 	  			}
 
 	  			Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
 					var $cat_id = get_hidden_field('m_cat_id');
 					var $tab_cat_id = document.getElementById($div_id).getAttribute('category_id');
 					if ($cat_id != $tab_cat_id || $force) {
 						// query tab content only in case if not queried or category don't match
 						var $url = this.URLMask.replace('#ITEM_PREFIX#', $prefix).replace('#TAB_NAME#', this.queryTabRegistry('prefix', $prefix, 'tab_id'));
 						this.BusyRequest[$prefix] = false;
 
 						Request.makeRequest($url, this.BusyRequest[$prefix], $div_id, this.successCallback, this.errorCallback, $div_id, this);
 					}
 				}
 
 	  			var $Catalog = new Catalog('<inp2:m_Link template="reviews/reviews_tab" item_prefix="#ITEM_PREFIX#" tab_name="#TAB_NAME#" pass_through="td,item_prefix,tab_name" td="no" m_cat_id="-1" no_amp="1" js_escape="1"/>', 'reviews_', 'Reviews');
 				var a_toolbar = new ToolBar();
 
 					a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 
 					a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 							std_delete_items($Catalog.ActivePrefix, null, 1);
 						} ) );
 
 
 					<inp2:m_ModuleInclude template="catalog_buttons" main_template="reviews" skip_prefixes="m,c" replace_m="yes"/>
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 					a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 							$Catalog.submit_event($Catalog.ActivePrefix, 'OnMassApprove');
 						}
 				 	) );
 
 					a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 							$Catalog.submit_event($Catalog.ActivePrefix, 'OnMassDecline');
 						}
 				 	) );
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
 					a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 								show_viewmenu(a_toolbar, 'view');
 							}
 					) );
 
 					a_toolbar.Render();
 
 					function edit()
 					{
 						$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 						var $kf = document.getElementById($form_name);
 
 						var $prev_action = $kf.action;
 						$kf.action = '<inp2:m_t pass="all" pass_through="item_prefix" item_prefix="#PREFIX#" no_amp="1" js_escape="1"/>' . replace('#PREFIX#', $Catalog.ActivePrefix);
 
 						std_edit_temp_item(
 							$Catalog.ActivePrefix, 'reviews/review_direct_edit',
 							function() {
 								$kf.action = $prev_action;
 							}
 						);
 					}
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="catalog_search_box"/>
 	</tr>
 </tbody>
 </table>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <!-- main kernel_form: end -->
 
 <inp2:m_set prefix_append="-rev" td="no"/>
 <inp2:m_ModuleInclude template="catalog_tab" tab_init="2" skip_prefixes="m,c" replace_m="yes"/>
 
 <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>
 
 <script type="text/javascript">
 	addLoadEvent(
 		function() {
 			$Catalog.Init();
 		}
 	);
 </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/incs/header.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/incs/header.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/incs/header.tpl	(revision 16603)
@@ -1,124 +1,124 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <inp2:m_CheckSSL mode="required" condition="Require_AdminSSL" />
 <inp2:m_CheckSSL/>
 <inp2:m_DefaultParam body_properties=""/>
 <html>
 <head>
 <title><inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>
 
 <meta http-equiv="content-type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>"/>
 <meta name="keywords" content="..."/>
 <meta name="description" content="..."/>
 <meta name="robots" content="all"/>
 <meta name="copyright" content="In-Portal CMS, Copyright &#174; 2011"/>
 <meta name="author" content="Intechnic Inc."/>
 
 <inp2:m_base_ref/>
 
 <link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 
 <inp2:adm_AdminSkin file_only="1" result_to_var="skin_css"/>
 <link rel="stylesheet" href="<inp2:m_Compress files='
 	js/jquery/ui-lightness/jquery-ui-1.10.3.custom.css|
 	js/jquery/thickbox/thickbox.css|
 	js/calendar/calendar-blue.css|
 	$skin_css|
 	{module_path}/img/toolbar/toolbar-sprite.css
 '/>" type="text/css" media="screen" />
 
 <script type="text/javascript" src="js/jquery/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="js/jquery/jquery-ui-1.10.3.custom.min.js"></script>
 
 <script type="text/javascript" src="<inp2:m_Compress files='
 	js/is.js|
 	js/ajax.js|
 	js/application.js|
 	js/script.js|
 	js/in-portal.js|
 	js/toolbar.js|
 	js/grid.js|
 	js/grid_filters.js|
 	js/simple_grid.js|
 	js/grid_scroller.js|
 	js/forms.js|
 	js/drag.js|
 	js/form_controls.js|
 	js/jquery/thickbox/thickbox.js|
 	js/tab_scroller.js|
 	js/calendar/calendar.js|
 	js/calendar/calendar-setup.js|
 	js/calendar/calendar-en.js
 '/>"></script>
 
 <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>,
 	multiple_windows = '1',
 	main_title = '<inp2:m_GetConfig var="Site_Name" js_escape="1"/>',
 	tpl_changed = 0,
 	base_url = '<inp2:m_BaseURL/>',
 	$base_path = '<inp2:m_GetConst name="BASE_PATH"/>',
 	img_path = '<inp2:m_TemplatesBase module="#MODULE#"/>/img/',
 	$typekit_id = '<inp2:m_GetConfig name="TypeKitId" js_escape="1"/>';
 
 var phrases = {
 	'la_Delete_Confirm' : '<inp2:m_Phrase label="la_Delete_Confirm" js_escape="1"/>'
 }
 
 NumberFormatter.ThousandsSep = '<inp2:lang.current_Field name="ThousandSep" js_escape="1"/>';
 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
 		}
 	}
 </inp2:m_if>
 
 var $use_toolbarlabels = <inp2:m_if check="adm_UseToolbarLabels">true<inp2:m_else/>false</inp2:m_if>;
 </script>
 
 <inp2:m_if check="m_get" var="m_wid">
 <style type="text/css">
 	.tableborder {
 		border: none;
 	}
 	.toolbar {
 		border-right: none;
 		border-left: none;
 	}
 	.tableborder_full {
 		border-right: none;
 		border-left: none;
 	}
 </style>
 </inp2:m_if>
 
 <inp2:m_ifnot check="adm_UsePopups">
 	<style type="text/css">
 		table.edit-form {
 			border: 1px solid black;
 		}
 	</style>
 </inp2:m_ifnot>
 
 </head>
 
 <inp2:m_include t="incs/blocks"/>
 <inp2:m_include t="incs/in-portal"/>
 
 <inp2:m_if check="m_ParamEquals" name="nobody" value="yes" inverse="inverse">
 	<body class="<inp2:m_if check="m_get" var="m_wid">edit-popup<inp2:m_else/>regular-body</inp2:m_if>" <inp2:m_param name="body_properties"/>>
 </inp2:m_if>
 
 <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
===================================================================
--- branches/5.2.x/core/admin_templates/config/config_general.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/config/config_general.tpl	(revision 16603)
@@ -1,180 +1,180 @@
 <inp2:m_include t="incs/header"/>
 
 <inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="conf" section="$section" perm_event="conf:OnLoad" title_preset="config_list_general"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 	<tbody>
 		<tr>
   			<td>
   				<script type="text/javascript">
 					function validate_password_fields() {
 						var $validated = true;
 
 						$("input[primarytype='password']", '#' + $form_name).each(
 							function ($e) {
 								if ( !validate_password_field(this.id) ) {
 									$validated = false;
 								}
 							}
 						);
 
 						return $validated;
 					}
 
 					function validate_password_field($field_id) {
 						var password_field = document.getElementById($field_id),
 							password_verify_field = document.getElementById('verify_' + $field_id);
 
 						if ( password_field && password_verify_field && password_field.value == password_verify_field.value ) {
 							return true;
 						}
 						else {
 							var password_error_cell = document.getElementById('error_' + $field_id);
 
 							if ( password_error_cell ) {
 								$(window).scrollTop($(password_field).position().top - 15);
 								password_error_cell.innerHTML = '<inp2:m_Phrase name="la_error_PasswordMatch"/>';
 							}
 
 							return false;
 						}
 					}
 
 					function toggle_section($label) {
 						var $table = document.getElementById('config_table');
 						var $row = null;
 						var $is_visible = false;
 
 						for (var $i = 0; $i < $table.rows.length; $i++) {
 							$row = $table.rows[$i];
 							if ( $row.getAttribute('header_label') != $label ) {
 								continue;
 							}
 
 							if ( !$row.style.display ) {
 								$row.style.display = document.all ? 'block' : 'table-row';
 							}
 
 							$is_visible = !($row.style.display == 'none');
 							$row.style.display = $is_visible ? 'none' : (document.all ? 'block' : 'table-row');
 
 							document.getElementById('toggle_mark[' + $label + ']').innerHTML = '[' + ($is_visible ? '+' : '-') + ']';
 						}
 					}
 
   					var a_toolbar = new ToolBar();
 
 					a_toolbar.AddButton(
 						new ToolBarButton(
 							'select',
 							'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
 							function() {
 								submit_event('conf','<inp2:conf_SaveEvent/>');
 							}
 						)
 					);
 
 					a_toolbar.AddButton(
 						new ToolBarButton(
 							'cancel',
 							'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
 							function() {
 								submit_event('conf','OnCancel');
 							}
 					 	)
 					);
 
 					<inp2:m_if check="m_IsDebugMode">
 						a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 						a_toolbar.AddButton(
 							new ToolBarButton(
 								'new_item',
 								'<inp2:m_phrase label="la_ToolTip_NewSystemSetting" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 								function() {
 									std_precreate_item('conf', 'config/config_edit');
 								}
 							)
 						);
 					</inp2:m_if>
 
 					<inp2:m_ModuleInclude template = "config/custom_toolbar"/>
 
 					a_toolbar.Render();
 				</script>
 			</td>
 		</tr>
 	</tbody>
 </table>
 
 <inp2:m_include t="incs/config_blocks"/>
 
 <inp2:m_RenderElement name="config_updated_notice"/>
 <inp2:conf_SaveWarning name="grid_save_warning"/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
 	<!-- module root category selector: begin -->
 	<tr class="subsectiontitle">
 		<td colspan="2">
 	    		<inp2:m_phrase name="la_Text_RootCategory" />
 	   		</td>
    		<td align="right">
    			<a class="config-header" href="javascript:toggle_section('la_Text_RootCategory');" id="toggle_mark[la_Text_RootCategory]" title="Collapse/Expand Section">[-]</a>
    		</td>
 	</tr>
 
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" header_label="la_Text_RootCategory">
 		<td>
 			<span class="text"><inp2:m_phrase name="la_prompt_RootCategory" /></span>
 		</td>
 		<td>
 			<inp2:m_DefineElement name="category_caption">
 				<inp2:m_ifnot check="m_Param" name="is_first">
 					<inp2:m_param name="separator"/>
 				</inp2:m_ifnot>
 				<inp2:m_param name="cat_name"/>
 			</inp2:m_DefineElement>
 
 			<b><inp2:conf_CategoryPath separator=" &gt; " render_as="category_caption" /></b>
 			<input type="hidden" name="conf[ModuleRootCategory][VariableValue]" value="<inp2:conf_ModuleRootCategory/>"/>
 			<a href="<inp2:adm_SelectorLink prefix='conf' selection_mode='single' tab_prefixes='none'/>" onclick="openSelector('conf', this.href, 'ModuleRootCategory', '950x600'); return false;"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
 		</td>
 		<td class="error">&nbsp;</td>
 	</tr>
 	<!-- module root category selector: end -->
 
 	<inp2:conf_PrintList block="config_block" per_page="-1" full_block="config_block" half_block1="config_block1" half_block2="config_block2" value_render_as="cf_default_value"/>
 </table>
 
 <script type="text/javascript">
 	<inp2:m_if check="m_Get" name="refresh_tree">
 		getFrame('menu').location.reload();
 	</inp2:m_if>
 
 	<inp2:m_if check="m_Get" name="refresh_all">
 		var $menu_frame = getFrame('menu');
 
 		$menu_frame.parent.location.href = $menu_frame.parent.location.href;
 	</inp2:m_if>
 
 	Application.setHook(
 		'conf:*',
 		function ($event) {
 			$event.status = $event.Name == 'OnCancel' ? true : validate_password_fields();
 		}
 	);
 
 	<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);
 			}
 		});
 	</inp2:m_if>
 </script>
 
 <inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/admin_templates/config/config_universal.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/config/config_universal.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/config/config_universal.tpl	(revision 16603)
@@ -1,153 +1,153 @@
 <inp2:m_include t="incs/header"/>
 
 <inp2:conf_InitList per_page="-1"/>
 <inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="conf" section="$section" title_preset="section_label" perm_event="conf:OnLoad"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 	<tbody>
 		<tr>
 			<td>
 				<script type="text/javascript">
 					function validate_password_fields() {
 						var $validated = true;
 
 						$("input[primarytype='password']", '#' + $form_name).each(
 							function ($e) {
 								if ( !validate_password_field(this.id) ) {
 									$validated = false;
 								}
 							}
 						);
 
 						return $validated;
 					}
 
 					function validate_password_field($field_id) {
 						var password_field = document.getElementById($field_id),
 							password_verify_field = document.getElementById('verify_' + $field_id);
 
 						if ( password_field && password_verify_field && password_field.value == password_verify_field.value ) {
 							return true;
 						}
 						else {
 							var password_error_cell = document.getElementById('error_' + $field_id);
 
 							if ( password_error_cell ) {
 								$(window).scrollTop($(password_field).position().top - 15);
 								password_error_cell.innerHTML = '<inp2:m_Phrase name="la_error_PasswordMatch"/>';
 							}
 
 							return false;
 						}
 					}
 
 					function toggle_section($label) {
 						var $row = null,
 							$is_visible = false,
 							$table = document.getElementById('config_table');
 
 						for (var $i = 0; $i < $table.rows.length; $i++) {
 							$row = $table.rows[$i];
 							if ( $row.getAttribute('header_label') != $label ) {
 								continue;
 							}
 
 							if ( !$row.style.display ) {
 								$row.style.display = document.all ? 'block' : 'table-row';
 							}
 
 							$is_visible = !($row.style.display == 'none');
 							$row.style.display = $is_visible ? 'none' : (document.all ? 'block' : 'table-row');
 
 							document.getElementById('toggle_mark[' + $label + ']').innerHTML = '[' + ($is_visible ? '+' : '-') + ']';
 						}
 					}
 
 					var a_toolbar = new ToolBar();
 
 					a_toolbar.AddButton(
 						new ToolBarButton(
 							'select',
 							'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
 							function () {
 								submit_event('conf', '<inp2:conf_SaveEvent/>');
 							}
 						)
 					);
 
 					a_toolbar.AddButton(
 						new ToolBarButton(
 							'cancel',
 							'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
 							function () {
 								submit_event('conf', 'OnCancel');
 							}
 						)
 					);
 
 					<inp2:m_if check="m_IsDebugMode">
 						a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 						a_toolbar.AddButton(
 							new ToolBarButton(
 								'new_item',
 								'<inp2:m_phrase label="la_ToolTip_NewSystemSetting" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 								function() {
 									std_precreate_item('conf', 'config/config_edit');
 								}
 							)
 						);
 					</inp2:m_if>
 
 					<inp2:m_ModuleInclude template = "config/custom_toolbar"/>
 
 					a_toolbar.Render();
 				</script>
 			</td>
 		</tr>
 	</tbody>
 </table>
 
 <inp2:m_include t="incs/config_blocks"/>
 
 <inp2:m_RenderElement name="config_updated_notice"/>
 <inp2:conf_SaveWarning name="grid_save_warning"/>
 
 <div id="scroll_container">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
 		<inp2:conf_PrintList list_name="default" block="config_block" full_block="config_block" half_block1="config_block1" half_block2="config_block2" value_render_as="cf_default_value"/>
 	</table>
 </div>
 
 <script type="text/javascript">
 	<inp2:m_if check="m_Get" name="refresh_tree">
 		getFrame('menu').location.reload();
 	</inp2:m_if>
 
 	<inp2:m_if check="m_Get" name="refresh_all">
 		var $menu_frame = getFrame('menu');
 
 		$menu_frame.parent.location.href = $menu_frame.parent.location.href;
 	</inp2:m_if>
 
 	Application.setHook(
 		'conf:*',
 		function ($event) {
 			$event.status = $event.Name == 'OnCancel' ? true : validate_password_fields();
 		}
 	);
 
 	<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);
 			}
 		});
 	</inp2:m_if>
 </script>
 
 <inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/admin_templates/languages/phrase_list.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/languages/phrase_list.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/languages/phrase_list.tpl	(revision 16603)
@@ -1,56 +1,56 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:phrases" pagination="1" grid="Phrases" prefix="phrases" title_preset="phrases_list_st" additional_blue_bar_render_as="grid_ml_selector"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
 		<td>
 			<script type="text/javascript">
 				//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');
 				}
 
 				var a_toolbar = new ToolBar();
 
 				<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_NewPhrase" short_title="la_ToolTip_Add">
 					std_precreate_item('phrases', 'languages/phrase_edit');
 				</inp2:m_RenderElement>
 
 				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit">
 					edit();
 				</inp2:m_RenderElement>
 
 				<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete">
 					std_delete_items('phrases');
 				</inp2:m_RenderElement>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				<inp2:m_RenderElement design="toolbar_button" icon="export" title="la_ToolTip_Export" short_title="la_ShortToolTip_Export">
 					open_popup('phrases', 'OnExportPhrases', 'regional/languages_export');
 				</inp2:m_RenderElement>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View">
 					show_viewmenu(a_toolbar,'view');
 				</inp2:m_RenderElement>
 
 				a_toolbar.Render();
 			</script>
 		</td>
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="phrases" grid="Phrases"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="phrases" IdField="PhraseId" grid="Phrases" menu_filters="yes"/>
 <script type="text/javascript">
 	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/advanced_view.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/catalog/advanced_view.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/catalog/advanced_view.tpl	(revision 16603)
@@ -1,149 +1,149 @@
 <inp2:m_include t="incs/header" noform="yes"/>
 <inp2:m_include template="catalog/catalog_elements"/>
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:browse" prefix="c" title_preset="advanced_view" tabs="catalog/catalog_tabs" special=".showall" additional_blue_bar_render_as="theme_selector"/>
 
 <!-- main kernel_form: begin -->
 <inp2:m_RenderElement name="kernel_form"/>
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
 			<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress files='incs/nlsmenu.css'/>" type="text/css" />
 			<script type="text/javascript" src="<inp2:m_Compress files='
 				js/nlsmenu.js|
 				js/nlsmenueffect_1_2_1.js|
 				js/catalog.js
 			'/>"></script>
 
 	  		<script type="text/javascript">
 	  			<inp2:m_if check="adm_CheckPermCache">
 	  				$(document).ready(
 	  					function() {
 	  						Application.SetVar('continue', 1);
 	  						openSelector('c', '<inp2:m_t t="categories/cache_updater" pass="m" no_amp="1" js_escape="1"/>');
 	  					}
 	  				);
 	  			</inp2:m_if>
 
 	  			var menuMgr = new NlsMenuManager("mgr");
 					menuMgr.timeout = 500;
 					menuMgr.flowOverFormElement = true;
 
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 
 	  			Catalog.prototype.AfterInit = function() {
 	  				this.switchTab();
 	  			}
 
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1" js_escape="1"/>', 'advanced_view_', 'AdvancedView');
 				var a_toolbar = new ToolBar();
 
 					<inp2:m_set ts="showall" td="no"/>
 					<inp2:m_ModuleInclude template="catalog_tab" tab_init="1" replace_m="yes"/>
 
 					a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 
 					a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							var $template = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'view_template');
 							$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 							set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
 							std_delete_items($Catalog.ActivePrefix, $template, 1);
 						} ) );
 
 
 					<inp2:m_ModuleInclude template="catalog_buttons" main_template="advanced_view"/>
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 					a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 							set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
 							$Catalog.submit_event($Catalog.ActivePrefix, 'OnMassApprove');
 						}
 				 	) );
 
 					a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 							set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
 							$Catalog.submit_event($Catalog.ActivePrefix, 'OnMassDecline');
 						}
 				 	) );
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
 					a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 								show_viewmenu(a_toolbar, 'view');
 							}
 					) );
 
 					a_toolbar.Render();
 
 					function edit() {
 						$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 						var $kf = document.getElementById($form_name);
 
 						var $prev_action = $kf.action;
 						$kf.action = '<inp2:m_t pass="all" no_pass_through="1" no_amp="1" js_escape="1"/>';
 
 						set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
 						std_edit_item(
 							$Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template'),
 							function() {
 								$kf.action = $prev_action;
 							}
 						);
 					}
 
 					function add_item() {
 						$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
 						var $kf = document.getElementById($form_name);
 
 						var $prev_action = $kf.action;
 						$kf.action = '<inp2:m_t pass="all" no_pass_through="1" no_amp="1" js_escape="1"/>';
 
 						set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
 						std_precreate_item(
 							$Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template'),
 							function() {
 								$kf.action = $prev_action;
 							}
 						);
 					}
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="catalog_search_box"/>
 	</tr>
 </tbody>
 </table>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <!-- main kernel_form: end -->
 
 <inp2:m_set ts="showall" td="no"/>
 <inp2:m_ModuleInclude template="catalog_tab" tab_init="2"/>
 
 <script type="text/javascript">
 	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 render_as="structure_node" section_name="in-portal:browse" js_escape="1"/>', false);
 	}
 
 	Application.setHook(
 		'm:OnAfterWindowLoad',
 		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/catalog/item_selector/item_selector_toolbar.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(revision 16602)
+++ branches/5.2.x/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(revision 16603)
@@ -1,78 +1,78 @@
 <link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress files='incs/nlsmenu.css'/>" type="text/css" />
 <script type="text/javascript" src="<inp2:m_Compress files='
 	js/nlsmenu.js|
 	js/nlsmenueffect_1_2_1.js|
 	js/catalog.js
 '/>"></script>
 
 <script type="text/javascript">
 	var menuMgr = new NlsMenuManager("mgr");
 	menuMgr.timeout = 500;
 	menuMgr.flowOverFormElement = true;
 
 	Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 	var a_toolbar = new ToolBar();
 
 	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 				<inp2:m_if check="m_ParamEquals" name="is_catalog" value="1">
 					active_selected = '';
 					if (Grids[$Catalog.ActivePrefix]) {
 						active_selected = Grids[$Catalog.ActivePrefix].GetSelected();
 						set_hidden_field('selected_ids[' + $Catalog.ActivePrefix + ']', active_selected);
 					}
 					if (active_selected.length == 0) {
 						var $category_ids = Grids['c'].GetSelected();
 						if ($category_ids.length == 0) {
 							// no categories selected, then use current category
 							$category_ids = get_hidden_field('m_cat_id');
 						}
 						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>
 
 				var $opener = getWindowOpener(window);
 
 				if ( $.isFunction($opener.processItemSelector) ) {
 					$opener.processItemSelector('<inp2:m_Recall name="dst_field"/>', window);
 					window_close();
 				}
 				else {
 					submit_event('<inp2:m_Recall name="main_prefix"/>', 'OnProcessSelected');
 				}
 			}
 		) );
 	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 				window_close();
 			}
 	 	) );
 
 	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 	<inp2:m_if check="m_ParamEquals" name="is_catalog" value="1">
 		a_toolbar.AddButton( new ToolBarButton('upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
 					$Catalog.go_to_cat($Catalog.ParentCategoryID);
 				}
 		 	) );
 
 		a_toolbar.AddButton( new ToolBarButton('homecat', '<inp2:m_phrase label="la_ToolTip_Home" escape="1"/>', function() {
 					$Catalog.go_to_cat(<inp2:c_HomeCategory/>);
 				}
 		 	) );
 		a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 	</inp2:m_if>
 
 	a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 				show_viewmenu(a_toolbar, 'view');
 			}
 	) );
 
 	a_toolbar.Render();
 
 	function edit()
 	{
 
 	}
-</script>
\ No newline at end of file
+</script>