Index: branches/5.3.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r15698 -r15902
--- branches/5.3.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 15698)
+++ branches/5.3.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 15902)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_tag_processor.php 15698 2013-02-19 11:33:17Z alex $
+* @version	$Id: admin_tag_processor.php 15902 2013-07-12 15:37:15Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -341,17 +341,6 @@
 			return date($params['format']);
 		}
 
-		function TreeEditWarrning($params)
-		{
-			$ret = $this->Application->Phrase($params['label']);
-			$ret = str_replace(Array('&lt;', '&gt;', 'br/', 'br /', "\n", "\r"), Array('<', '>', 'br', 'br', '', ''), $ret);
-			if (getArrayValue($params, 'escape')) {
-				$ret = addslashes($ret);
-			}
-			$ret = str_replace('<br>', '\n', $ret);
-			return $ret;
-		}
-
 		/**
 		 * Draws section tabs using block name passed
 		 *
@@ -636,9 +625,9 @@
 
 		function PrintColumns($params)
 		{
+			/* @var $picker_helper kColumnPickerHelper */
 			$picker_helper = $this->Application->recallObject('ColumnPickerHelper');
 			$picker_helper->SetGridName($this->Application->GetLinkedVar('grid_name'));
-			/* @var $picker_helper kColumnPickerHelper */
 
 			$main_prefix = $this->Application->RecallVar('main_prefix');
 			$cols = $picker_helper->LoadColumns($main_prefix);
@@ -990,10 +979,9 @@
 
 			foreach ($a_data as $a_row) {
 				$cells = '';
-				$a_row = array_map('htmlspecialchars', $a_row);
 
 				foreach ($a_row as $value) {
-					$cells .= '<td>' . $value . '</td>';
+					$cells .= '<td>' . kUtil::escape($value, kUtil::ESCAPE_HTML) . '</td>';
 				}
 
 				$ret .= $this->Application->ParseBlock(Array ('name' => $block, 'cells' => $cells));