Index: branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -r15145 -r16513
--- branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 15145)
+++ branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_event_handler.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: custom_fields_event_handler.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -48,8 +48,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$item_type = $this->Application->GetVar('cf_type');
 			if ( !$item_type ) {
@@ -108,8 +108,9 @@
 
 			$hidden_fields = Array ();
 			$virtual_fields = $this->Application->getUnitOption($prefix, 'VirtualFields', Array ());
+
+			/** @var Array $custom_fields */
 			$custom_fields = $this->Application->getUnitOption($prefix, 'CustomFields', Array ());
-			/* @var $custom_fields Array */
 
 			foreach ($custom_fields as $custom_field) {
 				$check_field = 'cust_' . $custom_field;
@@ -134,8 +135,8 @@
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT COUNT(*)
 					FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
@@ -160,13 +161,13 @@
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			// call main item config to clone cdata table
 			$this->Application->getUnitOption($main_prefix, 'TableName');
@@ -202,13 +203,13 @@
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			// call main item config to clone cdata table
 			define('CUSTOM_FIELD_ADDED', 1); // used in cdata::scanCustomFields method
@@ -245,8 +246,8 @@
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('Type', $this->Application->GetVar('cf_type'));
 		}
@@ -262,15 +263,15 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !in_array($object->GetDBField('ElementType'), $this->_getMultiElementTypes()) ) {
 				return ;
 			}
 
+			/** @var InpCustomFieldsHelper $custom_field_helper */
 			$custom_field_helper = $this->Application->recallObject('InpCustomFieldsHelper');
-			/* @var $custom_field_helper InpCustomFieldsHelper */
 
 			$options = $custom_field_helper->GetValuesHash($object->GetDBField('ValueList'), VALUE_LIST_SEPARATOR, false);
 
@@ -286,8 +287,8 @@
 				$records[] = Array ('OptionKey' => $option_key, 'OptionTitle' => $option_title);
 			}
 
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			$xml = $minput_helper->prepareMInputXML($records, Array ('OptionKey', 'OptionTitle'));
 			$object->SetDBField('Options', $xml);
@@ -315,15 +316,15 @@
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !in_array($object->GetDBField('ElementType'), $this->_getMultiElementTypes()) ) {
 				return ;
 			}
 
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			$ret = $object->GetDBField('ElementType') == 'select' ? Array ('' => '=+') : Array ();
 			$records = $minput_helper->parseMInputXML($object->GetDBField('Options'));