Index: branches/5.2.x/core/kernel/db/cat_dbitem.php
===================================================================
diff -u -N -r16037 -r16513
--- branches/5.2.x/core/kernel/db/cat_dbitem.php	(.../cat_dbitem.php)	(revision 16037)
+++ branches/5.2.x/core/kernel/db/cat_dbitem.php	(.../cat_dbitem.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_dbitem.php 16037 2014-06-25 10:12:31Z alex $
+* @version	$Id: cat_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
@@ -283,8 +283,8 @@
 					WHERE ResourceId = %s';
 			$ids = $this->Conn->GetCol(sprintf($sql, $id_field, $this->TableName, $resource_id));
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($this->Prefix, $this->Special, $ids);
 		}
@@ -313,8 +313,8 @@
 	 */
 	function stripDisallowed($filename)
 	{
+		/** @var kFilenamesHelper $filenames_helper */
 		$filenames_helper = $this->Application->recallObject('FilenamesHelper');
-		/* @var $filenames_helper kFilenamesHelper */
 
 		$table = $this->IsTempTable() ? $this->Application->GetTempName(TABLE_PREFIX.'CategoryItems', 'prefix:'.$this->Prefix) : TABLE_PREFIX.'CategoryItems';
 
@@ -517,8 +517,8 @@
 
 		if ( $this->raiseEvent('OnBeforeDeleteOriginal', null, Array ('original_id' => $original_id)) ) {
 			// delete original item, because changes made in pending copy (this item) got to be approved in this method
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($this->Prefix, $this->Special, Array ($original_id));
 
@@ -546,8 +546,8 @@
 		}
 
 		// delete this item, because changes made in pending copy (this item) will be declined in this method
+		/** @var kTempTablesHandler $temp_handler */
 		$temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-		/* @var $temp_handler kTempTablesHandler */
 
 		$temp_handler->DeleteItems($this->Prefix, $this->Special, Array ($this->GetID()));