Index: branches/5.3.x/core/units/images/image_event_handler.php
===================================================================
diff -u -N -r16395 -r16519
--- branches/5.3.x/core/units/images/image_event_handler.php	(.../image_event_handler.php)	(revision 16395)
+++ branches/5.3.x/core/units/images/image_event_handler.php	(.../image_event_handler.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: image_event_handler.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: image_event_handler.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -84,8 +84,8 @@
 	 */
 	protected function customProcessing(kEvent $event, $type)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 			$ids = $event->getEventParam('ids');
@@ -152,8 +152,8 @@
 	{
 		$id = $event->getEventParam('id');
 
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix, Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		if ( in_array($event->Name, Array ('OnBeforeDeleteFromLive', 'OnAfterClone')) ) {
 			$object->SwitchToLive();
@@ -167,8 +167,8 @@
 
 		$object->Load($id);
 
+		/** @var FileHelper $file_helper */
 		$file_helper = $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
 
 		$fields = Array ('LocalPath' => 'LocalImage', 'ThumbPath' => 'LocalThumb');
 
@@ -250,8 +250,8 @@
 	 */
 	protected function OnSetPrimary($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$object->SetDBField('DefaultImg', 1);
 		$object->Update();
@@ -284,8 +284,8 @@
 
 		$this->processImageStatus($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$object->Update();
 	}
@@ -297,8 +297,8 @@
 	 */
 	function processImageStatus($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$id = $object->GetDBField('ResourceId');
 
@@ -333,8 +333,8 @@
 	{
 		parent::SetCustomQuery($event);
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		if ( !$this->Application->isAdminUser ) {
 			$object->addFilter('active', '%1$s.Enabled = 1');
@@ -353,8 +353,8 @@
 			$object->addFilter('product_images', '%1$s.ResourceId = ' . $resource_id);
 		}
 
+		/** @var kSearchHelper $search_helper */
 		$search_helper = $this->Application->recallObject('SearchHelper');
-		/* @var $search_helper kSearchHelper */
 
 		$types = $event->getEventParam('types');
 		$except_types = $event->getEventParam('except');