Index: branches/5.2.x/admin_templates/user_item_tab.tpl
===================================================================
--- branches/5.2.x/admin_templates/user_item_tab.tpl	(revision 16613)
+++ branches/5.2.x/admin_templates/user_item_tab.tpl	(revision 16614)
@@ -1,43 +1,43 @@
 <inp2:m_RequireLogin permissions="in-portal:user_list.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">
 			<div id="articles_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-news/user_item_tab" edit_template="in-news/articles/articles_edit" dep_buttons="new_article" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
 			<script type="text/javascript">$Catalog.registerTab('articles');</script>
 		</inp2:m_if>
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
 			<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
 		</inp2:m_if>
 	<inp2:m_else/>
 
 		<inp2:m_include t="incs/blocks"/>
 		<inp2:m_include t="incs/in-portal"/>
 		<inp2:m_include t="categories/ci_blocks"/>
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$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.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_DefineElement name="article_expire_td" no_special="">
 			<inp2:m_if check="Field" name="$field">
 				<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
 			<inp2:m_else/>
 				<inp2:m_phrase name="la_Never"/>
 			</inp2:m_if>
 		</inp2:m_DefineElement>
 
 		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
 
 		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
 		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
 		#separator#
 		<!-- articles tab: begin -->
 		<inp2:m_RenderElement name="kernel_form" form_name="articles_form"/>
 			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="kernel_form_end"/>
 		<!-- articles tab: end -->
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.2.x/admin_templates/catalog_tab.tpl
===================================================================
--- branches/5.2.x/admin_templates/catalog_tab.tpl	(revision 16613)
+++ branches/5.2.x/admin_templates/catalog_tab.tpl	(revision 16614)
@@ -1,64 +1,64 @@
 <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(
 					'in-news:new_article',
 					'<inp2:m_phrase label="la_ToolTip_NewArticle" escape="1"/>',
 					add_item,
 					true
 		 		)
 		 	);
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
 			<div id="articles_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-news/catalog_tab"  edit_template="in-news/articles/articles_edit" category_id="-1" dep_buttons="new_article" class="catalog-tab"><!-- IE minimal height problem fix --></div>
 			<script type="text/javascript">$Catalog.registerTab('articles');</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:$prefix_InitList grid="$grid_name"/>
 
 		$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.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_DefineElement name="article_expire_td" no_special="">
 			<inp2:m_if check="Field" name="$field">
 				<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
 			<inp2:m_else/>
 				<inp2:m_phrase name="la_Never"/>
 			</inp2:m_if>
 		</inp2:m_DefineElement>
 
 		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
 
 		<inp2:m_if check="m_ParamEquals" name="tab_dependant" value="yes">
 			Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true);
 		</inp2:m_if>
 		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"/>
 
 		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
 		<inp2:m_if check="m_ParamEquals" name="tab_mode" value="single">
 			Grids['<inp2:m_param name="prefix"/>'].DblClick = function() {return false};
 		</inp2:m_if>
 		#separator#
 		<!-- articles tab: begin -->
 		<inp2:m_RenderElement name="kernel_form" form_name="articles_form"/>
 		<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="kernel_form_end"/>
 		<!-- articles tab: end -->
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>