Index: branches/5.3.x/core/kernel/db/cat_tag_processor.php
===================================================================
diff -u -N -r16395 -r16519
--- branches/5.3.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_tag_processor.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: cat_tag_processor.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -53,8 +53,8 @@
 				return $icons['default'];
 			}
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			$value = $object->GetDBField($status_field); // sets base status icon
 
@@ -112,8 +112,8 @@
 				$item_id = $this->Application->GetVar($this->Prefix . '_id');
 			}
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$params['m_cat_page'] = 1;
 			$params['m_cat_id'] = $object->GetDBField('CategoryId');
@@ -131,11 +131,11 @@
 		 */
 		function PageBrowseLink($params)
 		{
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
+			/** @var SiteConfigHelper $site_config_helper */
 			$site_config_helper = $this->Application->recallObject('SiteConfigHelper');
-			/* @var $site_config_helper SiteConfigHelper */
 
 			$settings = $site_config_helper->getSettings();
 
@@ -160,8 +160,8 @@
 				$params['cat_id'] = $object->GetDBField('CategoryId');
 			}
 
+			/** @var kNavigationBar $navigation_bar */
 			$navigation_bar = $this->Application->recallObject('kNavigationBar');
-			/* @var $navigation_bar kNavigationBar */
 
 			return $navigation_bar->build($params);
 		}
@@ -201,16 +201,16 @@
 		{
 			$prefix = $this->Prefix . '-rev';
 
+			/** @var kDBTagProcessor $review_tag_processor */
 			$review_tag_processor = $this->Application->recallObject($prefix . '.item_TagProcessor');
-			/* @var $review_tag_processor kDBTagProcessor */
 
 			return $review_tag_processor->PrintList($params);
 		}
 
 		function ReviewCount($params)
 		{
+			/** @var kDBTagProcessor $review_tag_processor */
 			$review_tag_processor = $this->Application->recallObject('rev.item_TagProcessor');
-			/* @var $review_tag_processor kDBTagProcessor */
 
 			return $review_tag_processor->TotalRecords($params);
 		}
@@ -314,12 +314,13 @@
 		 */
 		function HasPermission($params)
 		{
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$params['raise_warnings'] = 0;
+
+			/** @var kCatDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kCatDBItem */
 
 			// 1. category restriction
 			$params['cat_id'] = $object->isLoaded() ? $object->GetDBField('ParentPath') : $this->Application->GetVar('m_cat_id');
@@ -361,8 +362,8 @@
 		 */
 		function HasAdditionalImages($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$cache_key = $object->Prefix . '_additional_images[%' . $this->Application->incrementCacheSerial($object->Prefix, $object->GetID(), false) . '%]';
 			$ret = $this->Application->getCache($cache_key);
@@ -398,8 +399,8 @@
 		{
 			static $favorite_status = Array ();
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			if ( !isset($favorite_status[$this->Special]) ) {
 				$resource_ids = $object->GetCol('ResourceId');
@@ -527,11 +528,11 @@
 		 */
 		function VotesIndicator($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
+			/** @var RatingHelper $rating_helper */
 			$rating_helper = $this->Application->recallObject('RatingHelper');
-			/* @var $rating_helper RatingHelper */
 
 			$small_style = array_key_exists('small_style', $params) ? $params['small_style'] : false;
 
@@ -669,8 +670,8 @@
 			$format = isset($params['format']) ? $params['format'] : '_regional_DateTimeFormat';
 
 			if ( preg_match("/_regional_(.*)/", $format, $regs) ) {
+				/** @var LanguagesItem $lang */
 				$lang = $this->Application->recallObject('lang.current');
-				/* @var $lang LanguagesItem */
 
 				if ( $regs[1] == 'DateTimeFormat' ) {
 					// combined format
@@ -693,8 +694,8 @@
 		 */
 		function ItemCount($params)
 		{
+			/** @var kCountHelper $count_helper */
 			$count_helper = $this->Application->recallObject('CountHelper');
-			/* @var $count_helper kCountHelper */
 
 			$today_only = isset($params['today']) && $params['today'];
 			return $count_helper->ItemCount($this->Prefix, $today_only);
@@ -770,8 +771,8 @@
 							c.l' . $this->Application->GetVar('m_lang') . '_CachedNavbar AS CachedNavbar
 					FROM ' . $category_config->getTableName() . ' c';
 
+			/** @var kCountHelper $count_helper */
 			$count_helper = $this->Application->recallObject('CountHelper');
-			/* @var $count_helper kCountHelper */
 
 			list ($sql, $where_clause) = $count_helper->attachViewPermissionCheck('c', $sql, $where_clause);
 
@@ -780,8 +781,8 @@
 
 		function PrintMoreCategories($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$category_ids = $this->Field($params);
 			if (!$category_ids) {
@@ -837,8 +838,8 @@
 		 */
 		function RegisterHit($params)
 		{
+			/** @var kCatDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kCatDBItem */
 
 			if ($object->isLoaded()) {
 				$object->RegisterHit();
@@ -883,8 +884,8 @@
 		 */
 		function ItemEditLink($params)
 		{
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			$config = $this->getUnitConfig();
 			$edit_template = $config->getAdminTemplatePath() . '/' . $config->getAdminTemplatePrefix() . 'edit';
@@ -927,8 +928,8 @@
 
 			$field = $this->SelectParam($params, 'name,field');
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			foreach ($languages as $language_id) {
 				$check_field = 'l' . $language_id . '_' . $field;
@@ -953,11 +954,11 @@
 				$categories = true;
 			}
 			else {
+				/** @var kDBItem $object */
 				$object = $this->getObject($params);
-				/* @var $object kDBItem */
 
+				/** @var kPermissionsHelper $perm_helper */
 				$perm_helper = $this->Application->recallObject('PermissionsHelper');
-				/* @var $perm_helper kPermissionsHelper */
 
 				$perm_prefix = $this->getUnitConfig()->getPermItemPrefix();
 				$categories = $perm_helper->getPermissionCategories($perm_prefix . '.' . ($object->IsNewItem() ? 'ADD' : 'MODIFY'));