Index: branches/5.2.x/core/units/helpers/controls/edit_picker_helper.php
===================================================================
diff -u -N -r15232 -r16513
--- branches/5.2.x/core/units/helpers/controls/edit_picker_helper.php	(.../edit_picker_helper.php)	(revision 15232)
+++ branches/5.2.x/core/units/helpers/controls/edit_picker_helper.php	(.../edit_picker_helper.php)	(revision 16513)
@@ -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 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -40,11 +40,11 @@
 				return ;
 			}
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
+			/** @var kDBItem $main_object */
 			$main_object = $this->Application->recallObject($event->getEventParam('link_to_prefix'));
-			/* @var $main_object kDBItem */
 
 			$selected_items = $main_object->GetDBField($storage_field);
 			if ($selected_items) {
@@ -74,8 +74,8 @@
 		 */
 		function LoadValues($event, $store_field, $source_field)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			list ($sub_prefix, $sub_prefix_field) = explode('.', $source_field);
 			$foreign_key = $this->Application->getUnitOption($sub_prefix, 'ForeignKey');
@@ -103,13 +103,13 @@
 		 */
 		function SaveValues(&$sub_event, $store_field, $sub_prefix_field)
 		{
+			/** @var kDBItem $main_object */
 			$main_object = $sub_event->MasterEvent->getObject();
-			/* @var $main_object kDBItem */
 
 			$affected_field = $main_object->GetDBField($store_field);
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($sub_event->getPrefixSpecial(), null, Array('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$sub_table = $object->TableName;
 			$foreign_key = $this->Application->getUnitOption($sub_event->Prefix, 'ForeignKey');