Index: branches/5.2.x/core/admin_templates/promo_block_groups/promo_block_group_list.tpl
===================================================================
diff -u -N -r15165 -r16062
--- branches/5.2.x/core/admin_templates/promo_block_groups/promo_block_group_list.tpl	(.../promo_block_group_list.tpl)	(revision 15165)
+++ branches/5.2.x/core/admin_templates/promo_block_groups/promo_block_group_list.tpl	(.../promo_block_group_list.tpl)	(revision 16062)
@@ -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" result_to_var="grid_error"/>
+		<inp2:m_Get name="grid_error" no_html_escape="1" 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/head.tpl
===================================================================
diff -u -N -r15539 -r16062
--- branches/5.2.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 15539)
+++ branches/5.2.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 16062)
@@ -110,7 +110,7 @@
 	}
 
 	function change_password() {
-		getFrame('main').set_hidden_field('u_id', <inp2:m_get name="u.current_id"/>);
+		getFrame('main').set_hidden_field('u_id', <inp2:m_get name="u.current_id" no_html_escape="1" js_escape="1"/>);
 
 		<inp2:m_if check="m_GetEquals" name="u.current_id" value="-1">
 			open_popup('u', '', 'users/root_edit_password');
@@ -122,4 +122,4 @@
 	$FrameResizer = new FrameResizer('<inp2:m_Phrase name="la_ToolTip_ShowMenu" js_escape="1"/>', '<inp2:m_Phrase name="la_ToolTip_HideMenu" js_escape="1"/>', window.parent, '<inp2:m_Link pass="m,adm" adm_event="OnSaveSetting" var_name="#NAME#" var_value="#VALUE#" no_amp="1"/>', <inp2:adm_MenuFrameWidth/>);
 	$FrameResizer.InitControls($FrameResizer);
 	$FrameResizer.SetStatus(<inp2:m_if check="m_RecallEquals" name="ShowAdminMenu" value="0" persistent="1">0<inp2:m_else/>1</inp2:m_if>);
-</script>
\ No newline at end of file
+</script>
Index: branches/5.2.x/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r15525 -r16062
--- branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 15525)
+++ branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16062)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 
 <inp2:conf_InitList name="Default" per_page="-1"/>
-<inp2:m_Get name="section" result_to_var="section"/>
+<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 -->
@@ -148,4 +148,4 @@
 	</inp2:m_if>
 </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/submissions/submissions_list.tpl
===================================================================
diff -u -N -r14614 -r16062
--- branches/5.2.x/core/admin_templates/submissions/submissions_list.tpl	(.../submissions_list.tpl)	(revision 14614)
+++ branches/5.2.x/core/admin_templates/submissions/submissions_list.tpl	(.../submissions_list.tpl)	(revision 16062)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header" />
 
-<inp2:m_Get var="form_id" result_to_var="form_id"/>
+<inp2:m_Get var="form_id" no_html_escape="1" 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 -->
@@ -64,4 +64,4 @@
 	Grids['formsubs'].SetDependantToolbarButtons( new Array('edit','delete') );
 </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/reviews/reviews_tab.tpl
===================================================================
diff -u -N -r15445 -r16062
--- branches/5.2.x/core/admin_templates/reviews/reviews_tab.tpl	(.../reviews_tab.tpl)	(revision 15445)
+++ branches/5.2.x/core/admin_templates/reviews/reviews_tab.tpl	(.../reviews_tab.tpl)	(revision 16062)
@@ -39,5 +39,5 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_Get name="item_prefix" result_to_var="prefix"/>
-<inp2:{$prefix}_InitCatalogTab render_as="catalog_tab" default_grid="ReviewsSection" radio_grid="Radio"/>
\ No newline at end of file
+<inp2:m_Get name="item_prefix" no_html_escape="1" 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/import/import_start.tpl
===================================================================
diff -u -N -r14244 -r16062
--- branches/5.2.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 16062)
@@ -3,7 +3,7 @@
 
 <inp2:m_set adm_id="0" />
 
-<inp2:m_Get var="PrefixSpecial" result_to_var="importprefix" />
+<inp2:m_Get var="PrefixSpecial" no_html_escape="1" 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"/>
 
@@ -50,4 +50,4 @@
 <input type="hidden" name="PrefixSpecial" value="<inp2:m_Get var="PrefixSpecial" />" />
 <input type="hidden" name="grid" value="<inp2:m_Get var="grid" />" />
 
-<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/catalog_counters.tpl
===================================================================
diff -u -N -r14244 -r16062
--- branches/5.2.x/core/admin_templates/catalog/catalog_counters.tpl	(.../catalog_counters.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/catalog/catalog_counters.tpl	(.../catalog_counters.tpl)	(revision 16062)
@@ -19,11 +19,11 @@
 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" result_to_var="last_template"/>
+	<inp2:m_Get name="last_template" no_html_escape="1" result_to_var="last_template"/>
 	<inp2:c_UpdateLastTemplate template="$last_template"/>
 <inp2:m_else/>
 	<inp2:c_UpdateLastTemplate template="catalog/catalog"/>
 </inp2:m_if>
 
 <inp2:m_include t="categories/ci_blocks"/>
-<inp2:m_RenderElement name="structure_reload_element"/>
\ No newline at end of file
+<inp2:m_RenderElement name="structure_reload_element"/>
Index: branches/5.2.x/core/admin_templates/export/export_progress.tpl
===================================================================
diff -u -N -r14244 -r16062
--- branches/5.2.x/core/admin_templates/export/export_progress.tpl	(.../export_progress.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/export/export_progress.tpl	(.../export_progress.tpl)	(revision 16062)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="515" height="194"/>
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get var="PrefixSpecial" result_to_var="exportprefix" />
+<inp2:m_Get var="PrefixSpecial" no_html_escape="1" 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"/>
 
@@ -32,4 +32,4 @@
 		$QueueProcessor = new AjaxProgressBar(action_url);
 	</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 -r15861 -r16062
--- branches/5.2.x/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 15861)
+++ branches/5.2.x/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16062)
@@ -35,7 +35,7 @@
 		// substiture 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"/>);
+		$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"/>
@@ -92,4 +92,4 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:c_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file
+<inp2:c_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.2.x/core/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -N -r15445 -r16062
--- branches/5.2.x/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 15445)
+++ branches/5.2.x/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 16062)
@@ -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"/>_div').setAttribute('group_id', <inp2:m_get name="group_id"/>);
-		maximizeElement( jq('#<inp2:m_get name="item_prefix"/>_div') );
+		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') );
 	}
 
 	<inp2:m_if check="c_SaveWarning">
@@ -74,4 +74,4 @@
 		</thead>
 		<inp2:c-perm_PrintPermissions render_as="permission_element"/>
 	</table>
-</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 -r15525 -r16062
--- branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 15525)
+++ branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 16062)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" result_to_var="section"/>
+<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 -->
@@ -177,4 +177,4 @@
 	</inp2:m_if>
 </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/categories/category_path.tpl
===================================================================
diff -u -N -r15165 -r16062
--- branches/5.2.x/core/admin_templates/categories/category_path.tpl	(.../category_path.tpl)	(revision 15165)
+++ branches/5.2.x/core/admin_templates/categories/category_path.tpl	(.../category_path.tpl)	(revision 16062)
@@ -2,7 +2,7 @@
 
 <inp2:m_if check="m_Get" name="ajax" equals_to="yes">
 	<inp2:m_NoDebug/>
-	<inp2:m_Get name="category_id" result_to_var="category_id"/>
+	<inp2:m_Get name="category_id" no_html_escape="1" result_to_var="category_id"/>
 </inp2:m_if>
 
 <inp2:m_DefineElement name="category_caption">
@@ -12,4 +12,4 @@
 	<inp2:m_param name="cat_name"/>
 </inp2:m_DefineElement>
 
-<inp2:c_CategoryPath cat_id="$category_id" separator=" &gt; " render_as="category_caption"/>
\ No newline at end of file
+<inp2:c_CategoryPath cat_id="$category_id" separator=" &gt; " render_as="category_caption"/>
Index: branches/5.2.x/core/admin_templates/config/config_search.tpl
===================================================================
diff -u -N -r14637 -r16062
--- branches/5.2.x/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 14637)
+++ branches/5.2.x/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 16062)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" result_to_var="section"/>
+<inp2:m_Get name="section" no_html_escape="1" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="confs" section="$section" perm_event="confs:OnLoad" title_preset="config_list_search"/>
 
 <!-- ToolBar -->
@@ -139,4 +139,4 @@
 </table>
 </inp2:m_if>
 
-<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/submissions/submission_edit_logs.tpl
===================================================================
diff -u -N -r14244 -r16062
--- branches/5.2.x/core/admin_templates/submissions/submission_edit_logs.tpl	(.../submission_edit_logs.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/submissions/submission_edit_logs.tpl	(.../submission_edit_logs.tpl)	(revision 16062)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="800" height="640"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_Get var="form_id" result_to_var="form_id"/>
+<inp2:m_Get var="form_id" no_html_escape="1" 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" />
 
@@ -146,4 +146,4 @@
 Grids['submission-log'].SetDependantToolbarButtons( new Array('edit','delete', 'resend') );
 </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/config/config_edit.tpl
===================================================================
diff -u -N -r15614 -r16062
--- branches/5.2.x/core/admin_templates/config/config_edit.tpl	(.../config_edit.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/config/config_edit.tpl	(.../config_edit.tpl)	(revision 16062)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="650" height="790"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_Get name="section" result_to_var="section"/>
+<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="config_edit"/>
 
 <!-- ToolBar -->
@@ -97,4 +97,4 @@
 	});
 </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/custom_fields/custom_fields_list.tpl
===================================================================
diff -u -N -r14244 -r16062
--- branches/5.2.x/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 16062)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" result_to_var="section"/>
+<inp2:m_Get name="section" no_html_escape="1" 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 -->
@@ -89,4 +89,4 @@
 	Grids['cf'].SetDependantToolbarButtons( new Array('edit','delete', 'clone', 'move_down', 'move_up') );
 </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/submissions/submission_log_edit.tpl
===================================================================
diff -u -N -r15614 -r16062
--- branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 15614)
+++ branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 16062)
@@ -2,7 +2,7 @@
 
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get var="form_id" result_to_var="form_id"/>
+<inp2:m_Get var="form_id" no_html_escape="1" 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 --->
@@ -131,4 +131,4 @@
 	</table>
 </div>
 
-<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/config/config_search_edit.tpl
===================================================================
diff -u -N -r15539 -r16062
--- branches/5.2.x/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 15539)
+++ branches/5.2.x/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 16062)
@@ -2,7 +2,7 @@
 
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" result_to_var="section"/>
+<inp2:m_Get name="section" no_html_escape="1" 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/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -N -r14244 -r16062
--- branches/5.2.x/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 16062)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="750" height="620"/>
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="section" result_to_var="section"/>
+<inp2:m_Get name="section" no_html_escape="1" 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/reviews/review_direct_edit.tpl
===================================================================
diff -u -N -r14244 -r16062
--- branches/5.2.x/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 16062)
@@ -2,7 +2,7 @@
 
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_Get name="item_prefix" result_to_var="prefix"/>
+<inp2:m_Get name="item_prefix" no_html_escape="1" result_to_var="prefix"/>
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:reviews" title_preset="review_edit"/>
 
 <!-- ToolBar -->
@@ -48,4 +48,4 @@
 	</table>
 </div>
 
-<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/submissions/submission_view.tpl
===================================================================
diff -u -N -r15858 -r16062
--- branches/5.2.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 15858)
+++ branches/5.2.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 16062)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="800" height="640"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_Get var="form_id" result_to_var="form_id"/>
+<inp2:m_Get var="form_id" no_html_escape="1" 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"/>
@@ -220,4 +220,4 @@
 	</inp2:m_ifnot>
 </inp2:m_if>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r16027 -r16062
--- branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 16027)
+++ branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 16062)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 16027 2014-04-29 13:00:46Z alex $
+* @version	$Id: main_processor.php 16062 2014-08-31 11:22:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -402,20 +402,20 @@
 			preg_match('/([^\[\]]+)\[(.*)\]/', $name, $regs);
 
 			$function_params = explode('][', $regs[2]);
-			$ret = $this->Application->GetVar($regs[1], Array ());
-			array_unshift_ref($function_params, $ret);
+			$ret = $this->Application->GetVar($regs[1], array());
+			kUtil::array_unshift_ref($function_params, $ret);
 
-			return call_user_func_array('getArrayValue', $function_params);
+			$ret = call_user_func_array('getArrayValue', $function_params);
 		}
 		else {
 			$ret = $this->Application->GetVar($name, '');
 		}
 
-		if (array_key_exists('no_html_escape', $params) && $params['no_html_escape']) {
-			return kUtil::unescape($ret, kUtil::ESCAPE_HTML);
+		if ( array_key_exists('no_html_escape', $params) && $params['no_html_escape'] ) {
+			return $this->Application->isAdmin ? $ret : kUtil::unescape($ret, kUtil::ESCAPE_HTML);
 		}
 
-		return $ret;
+		return kUtil::escape($ret, kUtil::ESCAPE_HTML);
 	}
 
 	/**