Index: branches/5.2.x/core/kernel/db/dbitem.php
===================================================================
diff -u -N -r16304 -r16513
--- branches/5.2.x/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 16304)
+++ branches/5.2.x/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dbitem.php 16304 2016-01-17 09:44:37Z alex $
+* @version	$Id: dbitem.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -127,8 +127,8 @@
 		$formatter = $this->GetFieldOption($field_name, 'formatter');
 
 		if ( $formatter ) {
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($formatter);
-			/* @var $formatter kFormatter */
 
 			$res = $formatter->Format($value, $field_name, $this, $format);
 		}
@@ -185,8 +185,8 @@
 
 		// kFormatter is always used, to make sure, that numeric value is converted to normal representation
 		// according to regional format, even when formatter is not set (try seting format to 1.234,56 to understand why)
+		/** @var kFormatter $formatter */
 		$formatter = $this->Application->recallObject(isset($options['formatter']) ? $options['formatter'] : 'kFormatter');
-		/* @var $formatter kFormatter */
 
 		$parsed = $formatter->Parse($value, $name, $this);
 
@@ -539,8 +539,8 @@
 
 		foreach ($this->Fields as $field => $options) {
 			if ( isset($options['formatter']) ) {
+				/** @var kFormatter $formatter */
 				$formatter = $this->Application->recallObject($options['formatter']);
-				/* @var $formatter kFormatter */
 
 				$formatter->UpdateMasterFields($field, $this->GetDBField($field), $options, $this);
 			}
@@ -1185,8 +1185,8 @@
 			$this->LogChanges($main_prefix, $mode);
 
 			if (!$this->IsTempTable()) {
+				/** @var kDBEventHandler $handler */
 				$handler = $this->Application->recallObject($this->Prefix . '_EventHandler');
-				/* @var $handler kDBEventHandler */
 
 				$ses_var_name = $main_prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 				$handler->SaveLoggedChanges($ses_var_name, $this->ShouldLogChanges());
@@ -1239,7 +1239,7 @@
 			// collect foreign key values (for serial reset)
 			$foreign_keys = $this->Application->getUnitOption($this->Prefix, 'ForeignKey', Array ());
 			$dependent_fields = $fields_hash['ParentId'] = $fields_hash['ParentPrefix'] = Array ();
-			/* @var $foreign_keys Array */
+			/** @var Array $foreign_keys */
 
 			if ( is_array($foreign_keys) ) {
 				foreach ($foreign_keys as $prefix => $field_name) {
@@ -1516,18 +1516,18 @@
 
 		$cdata_key = rtrim($this->Prefix . '-cdata.' . $this->Special, '.');
 
+		/** @var kDBItem $cdata */
 		$cdata = $this->Application->recallObject($cdata_key, null, Array ('skip_autoload' => true));
-		/* @var $cdata kDBItem */
 
 		$resource_id = $this->GetDBField('ResourceId');
 		$cdata->Load($resource_id, 'ResourceId');
 		$cdata->SetDBField('ResourceId', $resource_id);
 
+		/** @var kMultiLanguage $ml_formatter */
 		$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-		/* @var $ml_formatter kMultiLanguage */
 
+		/** @var kMultiLanguageHelper $ml_helper */
 		$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-		/* @var $ml_helper kMultiLanguageHelper */
 
 		$languages = $ml_helper->getLanguages();