Index: branches/5.2.x/core/kernel/kbase.php
===================================================================
diff -u -N -r16432 -r16513
--- branches/5.2.x/core/kernel/kbase.php	(.../kbase.php)	(revision 16432)
+++ branches/5.2.x/core/kernel/kbase.php	(.../kbase.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: kbase.php 16432 2016-11-18 09:30:26Z alex $
+* @version	$Id: kbase.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -883,8 +883,8 @@
 		if ( $formatter_class ) {
 			$value = ($formatter_class == 'kMultiLanguage') && !preg_match('/^l[0-9]+_/', $name) ? '' : $this->GetDBField($name);
 
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($formatter_class);
-			/* @var $formatter kFormatter */
 
 			return $formatter->Format($value, $name, $this, $format);
 		}
@@ -933,8 +933,8 @@
 
 		foreach ($fields as $field) {
 			if ( isset($this->Fields[$field]['formatter']) ) {
+				/** @var kFormatter $formatter */
 				$formatter = $this->Application->recallObject($this->Fields[$field]['formatter']);
-				/* @var $formatter kFormatter */
 
 				$formatter->UpdateSubFields($field, $this->GetDBField($field), $this->Fields[$field], $this);
 			}
@@ -955,8 +955,8 @@
 				continue;
 			}
 
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject( $this->Fields[$field_name]['formatter'] );
-			/* @var $formatter kFormatter */
 
 			$formatter->PrepareOptions($field_name, $this->Fields[$field_name], $this);
 		}
@@ -1083,8 +1083,8 @@
 				$table_info['ParentTableKey'] = getArrayValue($table_info, 'ParentTableKey', $parent_prefix);
 			}
 
+			/** @var kDBItem $main_object */
 			$main_object = $this->Application->recallObject($parent_prefix.'.'.$special, null, Array ('raise_warnings' => 0));
-			/* @var $main_object kDBItem */
 
 			if (!$main_object->isLoaded() && $guess_special) {
 				$main_object = $this->Application->recallObject($parent_prefix);