Index: branches/5.2.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r16373 -r16408
--- branches/5.2.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 16373)
+++ branches/5.2.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 16408)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_tag_processor.php 16373 2016-07-25 08:12:24Z alex $
+* @version	$Id: admin_tag_processor.php 16408 2016-11-13 18:54:25Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -614,29 +614,33 @@
 
 		function PrintColumns($params)
 		{
-			$picker_helper = $this->Application->recallObject('ColumnPickerHelper');
-			$picker_helper->SetGridName($this->Application->GetLinkedVar('grid_name'));
-			/* @var $picker_helper kColumnPickerHelper */
+			$picker_helper = new kColumnPickerHelper(
+				$this->Application->RecallVar('main_prefix'),
+				$this->Application->GetLinkedVar('grid_name')
+			);
 
-			$main_prefix = $this->Application->RecallVar('main_prefix');
-			$cols = $picker_helper->LoadColumns($main_prefix);
+			$cols = $picker_helper->getData();
 
 			$this->Application->Phrases->AddCachedPhrase('__FREEZER__', '-------------');
 
 			$o = '';
-			if (isset($params['hidden']) && $params['hidden']) {
-				foreach ($cols['hidden_fields'] as $col) {
-					$title = $this->Application->Phrase($cols['titles'][$col]);
-					$o .= "<option value='$col'>".$title;
+			if ( isset($params['hidden']) && $params['hidden'] ) {
+				foreach ( $cols->hiddenFields as $column_name ) {
+					$title = $this->Application->Phrase($cols->getTitle($column_name));
+					$o .= "<option value='$column_name'>" . $title;
 				}
 			}
 			else {
-				foreach ($cols['order'] as $col) {
-					if (in_array($col, $cols['hidden_fields'])) continue;
-					$title = $this->Application->Phrase($cols['titles'][$col]);
-					$o .= "<option value='$col'>".$title;
+				foreach ( $cols->allFields as $column_name ) {
+					if ( $cols->isHidden($column_name) ) {
+						continue;
+					}
+
+					$title = $this->Application->Phrase($cols->getTitle($column_name));
+					$o .= "<option value='$column_name'>" . $title;
 				}
 			}
+
 			return $o;
 		}