Index: branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php
===================================================================
diff -u -N -r16294 -r16513
--- branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php	(.../scheduled_task_eh.php)	(revision 16294)
+++ branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php	(.../scheduled_task_eh.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: scheduled_task_eh.php 16294 2015-10-25 17:41:19Z alex $
+* @version	$Id: scheduled_task_eh.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -46,8 +46,8 @@
 		{
 			parent::OnBeforeItemValidate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$event_string = $object->GetDBField('Event');
 
@@ -72,14 +72,14 @@
 		{
 			$scheduled_tasks_from_cache = $this->Application->EventManager->getScheduledTasks(true);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array ('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$processed_ids = Array ();
 			$scheduled_tasks_from_db = $this->Conn->Query($object->GetSelectSQL(), 'Name');
 
+			/** @var kCronHelper $cron_helper */
 			$cron_helper = $this->Application->recallObject('kCronHelper');
-			/* @var $cron_helper kCronHelper */
 
 			foreach ($scheduled_tasks_from_cache as $scheduled_task_name => $scheduled_task_params) {
 				if ( !isset($scheduled_tasks_from_db[$scheduled_task_name]) ) {
@@ -110,8 +110,8 @@
 			$delete_ids = $this->Conn->GetCol($sql);
 
 			if ($delete_ids) {
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
-				/* @var $temp_handler kTempTablesHandler */
 
 				$temp_handler->DeleteItems($event->Prefix, $event->Special, $delete_ids);
 			}
@@ -159,8 +159,8 @@
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ($ids) {
+				/** @var kDBItem $object */
 				$object = $event->getObject( Array ('skip_autoload' => true) );
-				/* @var $object kDBItem */
 
 				foreach ($ids as $id) {
 					$object->Load($id);
@@ -186,8 +186,8 @@
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ($ids) {
+				/** @var kDBItem $object */
 				$object = $event->getObject( Array ('skip_autoload' => true) );
-				/* @var $object kDBItem */
 
 				$where_clause = Array (
 					$object->TableName . '.' . $object->IDField . ' IN (' . implode(',', $ids) . ')',
@@ -219,11 +219,11 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kCronHelper $cron_helper */
 			$cron_helper = $this->Application->recallObject('kCronHelper');
-			/* @var $cron_helper kCronHelper */
 
 			$cron_helper->load($object, 'RunSchedule');
 		}
@@ -265,11 +265,11 @@
 		 */
 		protected function _itemChanged(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kCronHelper $cron_helper */
 			$cron_helper = $this->Application->recallObject('kCronHelper');
-			/* @var $cron_helper kCronHelper */
 
 			if ( $cron_helper->validateAndSave($object, 'RunSchedule') && !$object->GetDBField('NextRunOn_date') ) {
 				$next_run = $cron_helper->getMatch($object->GetDBField('RunSchedule'));
@@ -294,8 +294,8 @@
 				return;
 			}
 
+			/** @var kCronHelper $cron_helper */
 			$cron_helper = $this->Application->recallObject('kCronHelper');
-			/* @var $cron_helper kCronHelper */
 
 			$cron_helper->initUnit($event->Prefix, 'RunSchedule');