Index: branches/RC/core/units/general/helpers/col_picker_helper.php
===================================================================
diff -u -N -r9639 -r9969
--- branches/RC/core/units/general/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 9639)
+++ branches/RC/core/units/general/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 9969)
@@ -3,6 +3,13 @@
 class kColumnPickerHelper extends kHelper {
 	var $PickerData;
 	var $GridName;
+	var $UseFreezer;
+	
+	function Init($prefix,$special,$event_params=null)
+	{
+		parent::Init($prefix, $special, $event_params);
+		$this->UseFreezer = $this->Application->ConfigValue('UseColumnFreezer');
+	}
 
 	function LoadColumns($prefix)
 	{
@@ -90,10 +97,10 @@
 	{
 		$splited = $this->Application->processPrefix($prefix);
 		$grids = $this->Application->getUnitOption($splited['prefix'], 'Grids');
-		$conf_fields = array_merge_recursive(
+		$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'];
 
 		// we NEED to recall dummy here to apply fields changes imposed by formatters,