Index: branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/col_picker_helper.php
===================================================================
diff -u -r6889 -r7073
--- branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 6889)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 7073)
@@ -1,6 +1,8 @@
 <?php
 
 class kColumnPickerHelper extends kHelper {
+	var $PickerData;
+	var $GridName;
 
 	function LoadColumns($prefix)
 	{
@@ -22,14 +24,20 @@
 		return $cols;
 	}
 
-	function ApplyPicker($prefix, &$fields)
+	function ApplyPicker($prefix, &$fields, $grid_name)
 	{
+		$this->SetGridName($grid_name);
 		$this->PickerData = $this->LoadColumns($prefix);
 
 		uksort($fields, array($this, 'CmpElems'));
 		$this->RemoveHiddenColumns($fields);
 	}
 
+	function SetGridName($grid_name)
+	{
+		$this->GridName = $grid_name;
+	}
+
 	function CmpElems($a, $b)
 	{
 		$a_index = array_search($a, $this->PickerData['order']);
@@ -67,11 +75,11 @@
 		$this->Application->StorePersistentVar($prefix.'_columns_.'.$view_name, serialize($cols));
 	}
 
-	function GetColumns($prefix, $grid_name='Default')
+	function GetColumns($prefix)
 	{
 		$splited = $this->Application->processPrefix($prefix);
 		$grids = $this->Application->getUnitOption($splited['prefix'], 'Grids');
-		$conf_fields = $grids[$grid_name]['Fields'];
+		$conf_fields = $grids[$this->GridName]['Fields'];
 
 		// we NEED to recall dummy here to apply fields changes imposed by formatters,
 		// such as replacing multilingual field titles etc.