Index: branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 16610)
@@ -2,7 +2,7 @@
 
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get var="form_id" no_html_escape="1" result_to_var="form_id"/>
+<inp2:m_Get var="form_id" result_to_var="form_id"/>
 <inp2:m_RenderElement name="combined_header" prefix="formsubs" section="in-portal:submissions:$form_id" title_preset="submission_log_edit"/>
 
 <!-- ToolBar --->
Index: branches/5.2.x/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 16610)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="750" height="620"/>
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
+<inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="cf" section="$section" perm_event="cf:OnLoad" title_preset="custom_fields_edit"/>
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 16610)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="800" height="640"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_Get var="form_id" no_html_escape="1" result_to_var="form_id"/>
+<inp2:m_Get var="form_id" result_to_var="form_id"/>
 
 <inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db">
 	<inp2:m_RenderElement name="combined_header" prefix="formsubs" section="in-portal:submissions:$form_id" title_preset="formsubs_view" tab_preset="Default"/>
Index: branches/5.2.x/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r16603 -r16610
--- branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16603)
+++ branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16610)
@@ -1,7 +1,7 @@
 <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_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="conf" section="$section" title_preset="section_label" perm_event="conf:OnLoad"/>
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 16610)
@@ -5,8 +5,8 @@
 <inp2:m_else/>
 	<inp2:lang.current_SetContentType content_type="text/plain"/>
 	if ($request_visible) {
-		document.getElementById('<inp2:m_get name="item_prefix" no_html_escape="1" js_escape="1"/>_div').setAttribute('group_id', <inp2:m_get name="group_id" no_html_escape="1" js_escape="1"/>);
-		maximizeElement( jq('#<inp2:m_get name="item_prefix" no_html_escape="1" js_escape="1"/>_div') );
+		document.getElementById('<inp2:m_get name="item_prefix" js_escape="1"/>_div').setAttribute('group_id', <inp2:m_get name="group_id" js_escape="1"/>);
+		maximizeElement( jq('#<inp2:m_get name="item_prefix" js_escape="1"/>_div') );
 	}
 
 	<inp2:m_if check="c_SaveWarning">
Index: branches/5.2.x/core/admin_templates/reviews/review_direct_edit.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 16610)
@@ -2,7 +2,7 @@
 
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="item_prefix" no_html_escape="1" result_to_var="prefix"/>
+<inp2:m_Get name="item_prefix" result_to_var="prefix"/>
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:reviews" title_preset="review_edit"/>
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/import/import_start.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 16610)
@@ -3,7 +3,7 @@
 
 <inp2:m_set adm_id="0" />
 
-<inp2:m_Get var="PrefixSpecial" no_html_escape="1" result_to_var="importprefix" />
+<inp2:m_Get var="PrefixSpecial" result_to_var="importprefix" />
 <inp2:{$importprefix}_PermSection section="main" result_to_var="permsection" />
 <inp2:m_RenderElement name="combined_header" section="$permsection" prefix="adm" title_preset="csv_import"/>
 
Index: branches/5.2.x/core/admin_templates/promo_block_groups/promo_block_group_list.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/promo_block_groups/promo_block_group_list.tpl	(.../promo_block_group_list.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/promo_block_groups/promo_block_group_list.tpl	(.../promo_block_group_list.tpl)	(revision 16610)
@@ -56,7 +56,7 @@
 
 <inp2:m_if check="m_Get" var="grid_error">
 	<inp2:m_RenderElement design="form_message" pass_params="1">
-		<inp2:m_Get name="grid_error" no_html_escape="1" result_to_var="grid_error"/>
+		<inp2:m_Get name="grid_error" result_to_var="grid_error"/>
 		<inp2:m_Phrase name="$grid_error"/>
 	</inp2:m_RenderElement>
 </inp2:m_if>
Index: branches/5.2.x/core/admin_templates/submissions/submission_edit_logs.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/submissions/submission_edit_logs.tpl	(.../submission_edit_logs.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/submissions/submission_edit_logs.tpl	(.../submission_edit_logs.tpl)	(revision 16610)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="800" height="640"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_Get var="form_id" no_html_escape="1" result_to_var="form_id"/>
+<inp2:m_Get var="form_id" result_to_var="form_id"/>
 
 <inp2:m_RenderElement name="combined_header" prefix="formsubs" section="in-portal:submissions:$form_id" title_preset="submission_edit_logs" tab_preset="Default" />
 
Index: branches/5.2.x/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -N -r16603 -r16610
--- branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 16603)
+++ branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 16610)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
+<inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="conf" section="$section" perm_event="conf:OnLoad" title_preset="config_list_general"/>
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/config/config_search.tpl
===================================================================
diff -u -N -r16570 -r16610
--- branches/5.2.x/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 16570)
+++ branches/5.2.x/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 16610)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
+<inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="confs" section="$section" perm_event="confs:OnLoad" title_preset="config_list_search"/>
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/custom_fields/custom_fields_list.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 16610)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
+<inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="cf" section="$section" perm_event="cf:OnLoad" title_preset="custom_fields_list" pagination="1"/>
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/submissions/submissions_list.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/submissions/submissions_list.tpl	(.../submissions_list.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/submissions/submissions_list.tpl	(.../submissions_list.tpl)	(revision 16610)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header" />
 
-<inp2:m_Get var="form_id" no_html_escape="1" result_to_var="form_id"/>
+<inp2:m_Get var="form_id" result_to_var="form_id"/>
 <inp2:m_RenderElement name="combined_header" prefix="formsubs" section="in-portal:submissions:$form_id" pagination="1" title_preset="formsubs_list" />
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/config/config_search_edit.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 16610)
@@ -2,7 +2,7 @@
 
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
+<inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="confs" section="$section" perm_event="confs:OnLoad" title_preset="configsearch_edit"/>
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/head.tpl
===================================================================
diff -u -N -r16471 -r16610
--- branches/5.2.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 16471)
+++ branches/5.2.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 16610)
@@ -110,7 +110,7 @@
 	}
 
 	function change_password() {
-		var $user_id = Number('<inp2:m_get name="u.current_id" no_html_escape="1" js_escape="1"/>');
+		var $user_id = Number('<inp2:m_get name="u.current_id" js_escape="1"/>');
 
 		if ( $modal_windows ) {
 			getFrame('main').set_hidden_field('u_id', $user_id);
Index: branches/5.2.x/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r16603 -r16610
--- branches/5.2.x/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16603)
+++ branches/5.2.x/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16610)
@@ -35,7 +35,7 @@
 		// 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.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_RenderElement name="structure_reload_element"/>
Index: branches/5.2.x/core/admin_templates/catalog/catalog_counters.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/catalog/catalog_counters.tpl	(.../catalog_counters.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/catalog/catalog_counters.tpl	(.../catalog_counters.tpl)	(revision 16610)
@@ -19,7 +19,7 @@
 set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '').replace(/\s+/g, ' ').trim() );
 
 <inp2:m_if check="m_Get" name="last_template">
-	<inp2:m_Get name="last_template" no_html_escape="1" result_to_var="last_template"/>
+	<inp2:m_Get name="last_template" result_to_var="last_template"/>
 	<inp2:c_UpdateLastTemplate template="$last_template"/>
 <inp2:m_else/>
 	<inp2:c_UpdateLastTemplate template="catalog/catalog"/>
Index: branches/5.2.x/core/admin_templates/reviews/reviews_tab.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/reviews/reviews_tab.tpl	(.../reviews_tab.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/reviews/reviews_tab.tpl	(.../reviews_tab.tpl)	(revision 16610)
@@ -39,5 +39,5 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_Get name="item_prefix" no_html_escape="1" result_to_var="prefix"/>
+<inp2:m_Get name="item_prefix" result_to_var="prefix"/>
 <inp2:{$prefix}_InitCatalogTab render_as="catalog_tab" default_grid="ReviewsSection" radio_grid="Radio"/>
Index: branches/5.2.x/core/admin_templates/categories/category_path.tpl
===================================================================
diff -u -N -r16062 -r16610
--- branches/5.2.x/core/admin_templates/categories/category_path.tpl	(.../category_path.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/categories/category_path.tpl	(.../category_path.tpl)	(revision 16610)
@@ -2,7 +2,7 @@
 
 <inp2:m_if check="m_Get" name="ajax" equals_to="yes">
 	<inp2:m_NoDebug/>
-	<inp2:m_Get name="category_id" no_html_escape="1" result_to_var="category_id"/>
+	<inp2:m_Get name="category_id" result_to_var="category_id"/>
 </inp2:m_if>
 
 <inp2:m_DefineElement name="category_caption">
Index: branches/5.2.x/core/admin_templates/config/config_edit.tpl
===================================================================
diff -u -N -r16415 -r16610
--- branches/5.2.x/core/admin_templates/config/config_edit.tpl	(.../config_edit.tpl)	(revision 16415)
+++ branches/5.2.x/core/admin_templates/config/config_edit.tpl	(.../config_edit.tpl)	(revision 16610)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="650" height="790"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
+<inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="conf" section="$section" title_preset="config_edit"/>
 
 <!-- ToolBar -->
Index: branches/5.2.x/core/admin_templates/export/export_progress.tpl
===================================================================
diff -u -N -r16339 -r16610
--- branches/5.2.x/core/admin_templates/export/export_progress.tpl	(.../export_progress.tpl)	(revision 16339)
+++ branches/5.2.x/core/admin_templates/export/export_progress.tpl	(.../export_progress.tpl)	(revision 16610)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="515" height="194"/>
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get var="PrefixSpecial" no_html_escape="1" result_to_var="exportprefix" />
+<inp2:m_Get var="PrefixSpecial" result_to_var="exportprefix" />
 <inp2:{$exportprefix}_PermSection section="main" result_to_var="permsection" />
 <inp2:m_RenderElement name="combined_header" section="$permsection" prefix="adm" title_preset="csv_export"/>