Index: branches/5.3.x/core/units/helpers/controls/edit_picker_helper.php
===================================================================
diff -u -N -r15483 -r15698
--- branches/5.3.x/core/units/helpers/controls/edit_picker_helper.php	(.../edit_picker_helper.php)	(revision 15483)
+++ branches/5.3.x/core/units/helpers/controls/edit_picker_helper.php	(.../edit_picker_helper.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: edit_picker_helper.php 15232 2012-03-26 10:32:18Z alex $
+* @version	$Id: edit_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
@@ -16,11 +16,11 @@
 
 	class EditPickerHelper extends kHelper {
 
-
-		function getTable($prefix, $temp=false)
+		function getTable($prefix, $temp = false)
 		{
-			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
-			return $temp ? $this->Application->GetTempName($table_name, 'prefix:'.$prefix) : $table_name;
+			$table_name = $this->Application->getUnitConfig($prefix)->getTableName();
+
+			return $temp ? $this->Application->GetTempName($table_name, 'prefix:' . $prefix) : $table_name;
 		}
 
 		/**
@@ -78,7 +78,7 @@
 			/* @var $object kDBItem */
 
 			list ($sub_prefix, $sub_prefix_field) = explode('.', $source_field);
-			$foreign_key = $this->Application->getUnitOption($sub_prefix, 'ForeignKey');
+			$foreign_key = $this->Application->getUnitConfig($sub_prefix)->getForeignKey();
 
 			$sql = 'SELECT '.$sub_prefix_field.'
 					FROM '.$this->getTable($sub_prefix, $object->IsTempTable()).'
@@ -112,7 +112,7 @@
 			/* @var $object kDBItem */
 
 			$sub_table = $object->TableName;
-			$foreign_key = $this->Application->getUnitOption($sub_event->Prefix, 'ForeignKey');
+			$foreign_key = $sub_event->getUnitConfig()->getForeignKey();
 
 			// 1. get previous values from db
 			$sql = 'SELECT ' . $sub_prefix_field . '