Index: branches/5.3.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r16503 -r16519
--- branches/5.3.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16503)
+++ branches/5.3.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 16503 2016-12-26 18:16:21Z alex $
+* @version	$Id: dblist.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -670,8 +670,8 @@
 		$formatter_class = $this->GetFieldOption($field, 'formatter');
 
 		if ( $formatter_class ) {
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($formatter_class);
-			/* @var $formatter kFormatter */
 
 			$res = $formatter->Format($res, $field, $this);
 		}
@@ -747,8 +747,8 @@
 	 */
 	private function GetWhereClause($for_counting=false,$system_filters_only=false)
 	{
+		/** @var kMultipleFilter $where */
 		$where = $this->Application->makeClass('kMultipleFilter');
-		/* @var $where kMultipleFilter */
 
 		$where->addFilter(
 			'system_where',
@@ -797,8 +797,8 @@
 	private function GetHavingClause($for_counting=false, $system_filters_only=false, $aggregated = 0)
 	{
 		if ($for_counting) {
+			/** @var kMultipleFilter $aggregate_filter */
 			$aggregate_filter = $this->Application->makeClass('kMultipleFilter');
-			/* @var $aggregate_filter kMultipleFilter */
 
 			$aggregate_filter->addFilter('aggregate_system', $this->AggregateFilter[kDBList::FLT_SYSTEM]);
 			if (!$system_filters_only) {
@@ -807,8 +807,8 @@
 			return $this->extractCalculatedFields($aggregate_filter->getSQL(), 2);
 		}
 
+		/** @var kMultipleFilter $having */
 		$having = $this->Application->makeClass('kMultipleFilter');
-		/* @var $having kMultipleFilter */
 
 		$having->addFilter('system_having', $this->HavingFilter[kDBList::FLT_SYSTEM] );
 		if ($aggregated == 0) {
@@ -1316,8 +1316,8 @@
 				return;
 			}
 
+			/** @var kDBItem $parent_object */
 			$parent_object = $this->Application->recallObject($parent_prefix . '.' . $special);
-			/* @var $parent_object kDBItem */
 
 			if ( !$parent_object->isLoaded() ) {
 				$this->addFilter('parent_filter', 'FALSE');
@@ -1359,8 +1359,8 @@
 		$ret = Array ();
 
 		if ($formatted && array_key_exists('formatter', $this->Fields[$field])) {
+			/** @var kFormatter $formatter */
 			$formatter = $this->Application->recallObject($this->Fields[$field]['formatter']);
-			/* @var $formatter kFormatter */
 
 			while ($i < $this->SelectedCount) {
 				$ret[] = $formatter->Format($this->Records[$i][$field], $field, $this, $format);