Index: branches/5.3.x/core/units/helpers/col_picker_helper.php
===================================================================
diff -u -N -r15483 -r15698
--- branches/5.3.x/core/units/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 15483)
+++ branches/5.3.x/core/units/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: col_picker_helper.php 15425 2012-07-03 08:27:15Z alex $
+* @version	$Id: col_picker_helper.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -175,13 +175,16 @@
 	function GetColumns($prefix)
 	{
 		$splited = $this->Application->processPrefix($prefix);
-		$grids = $this->Application->getUnitOption($splited['prefix'], 'Grids');
-		$conf_fields = $this->UseFreezer ? array_merge_recursive(
-			array('__FREEZER__' => array('title' => '__FREEZER__')),
-			$grids[$this->GridName]['Fields']
-		) : $grids[$this->GridName]['Fields'];
-//		$conf_fields = $grids[$this->GridName]['Fields'];
+		$grid = $this->Application->getUnitConfig($splited['prefix'])->getGridByName($this->GridName);
 
+		if ( $this->UseFreezer ) {
+			$freezer_column = Array ('__FREEZER__' => Array ('title' => '__FREEZER__'));
+			$conf_fields = array_merge_recursive($freezer_column, $grid['Fields']);
+		}
+		else {
+			$conf_fields = $grid['Fields'];
+		}
+
 		// we NEED to recall dummy here to apply fields changes imposed by formatters,
 		// such as replacing multilingual field titles etc.
 		$dummy = $this->Application->recallObject($prefix, null, Array ('skip_autoload' => 1));