Index: branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php
===================================================================
diff -u -N -r15602 -r16513
--- branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 15602)
+++ branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_eh.php 15602 2012-11-05 14:21:06Z alex $
+* @version	$Id: mailing_list_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
@@ -55,8 +55,8 @@
 
 			$recipients = $this->Application->GetVar($recipient_type);
 			if ( $recipients ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$to = $recipient_type . '_' . implode(';' . $recipient_type . '_', array_keys($recipients));
 
@@ -120,8 +120,8 @@
 
 			$this->_deleteQueue($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// delete mailing attachments after mailing is deleted
 			$attachments = $object->GetField('Attachments', 'file_paths');
@@ -143,8 +143,8 @@
 		 */
 		function OnCancelMailing($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$ids = $this->StoreSelectedIDs($event);
 
@@ -170,8 +170,8 @@
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$this->Application->GetVar('mailing_recipient_type') ) {
 				// user manually typed email addresses -> normalize
@@ -212,8 +212,8 @@
 		 */
 		protected function setRequired(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->setRequired('MessageHtml', !$object->GetDBField('MessageText'));
 			$object->setRequired('MessageText', !$object->GetDBField('MessageHtml'));
@@ -230,8 +230,8 @@
 		{
 			parent::OnAfterItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$status = $object->GetDBField('Status');
 			if ( ($status != $object->GetOriginalField('Status')) && ($status == MailingList::CANCELLED) ) {
@@ -246,8 +246,8 @@
 		 */
 		function _deleteQueue($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'DELETE FROM ' . $this->Application->getUnitOption('email-queue', 'TableName') . '
 					WHERE MailingId = ' . $object->GetID();
@@ -309,8 +309,8 @@
 				return;
 			}
 
+			/** @var MailingListHelper $mailing_list_helper */
 			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-			/* @var $mailing_list_helper MailingListHelper */
 
 			foreach ($mailing_lists as $mailing_id => $mailing_data) {
 				if ( $mailing_data['EmailsTotal'] == 0 ) {
@@ -381,8 +381,8 @@
 				return ;
 			}
 
+			/** @var MailingListHelper $mailing_list_helper */
 			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-			/* @var $mailing_list_helper MailingListHelper */
 
 			$mailing_list_helper->processQueue($messages);
 		}
@@ -398,8 +398,8 @@
 		{
 			$event->status = kEvent::erSTOP;
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			echo $object->GetDBField('MessageHtml');
 		}