Index: branches/5.3.x/units/private_messages/private_message_eh.php
===================================================================
diff -u -N -r16397 -r16521
--- branches/5.3.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 16397)
+++ branches/5.3.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 16521)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_message_eh.php 16397 2016-11-12 17:36:29Z alex $
+* @version	$Id: private_message_eh.php 16521 2017-01-20 20:26:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -55,8 +55,8 @@
 				$this->Application->SetVar('folder_id', $folder_id);
 			}
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$user_id = $this->Application->RecallVar('user_id');
 
@@ -81,8 +81,8 @@
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $object->GetDBField('FolderId') != PM_FOLDER_SENT ) {
 				// when creating "Inbox" message (from "Sent" message) don't reset folder & status
@@ -106,8 +106,8 @@
 		{
 			parent::OnAfterItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->Application->emailUser('PM.ADD', $object->GetDBField('ToId'), $object->getEmailParams());
 
@@ -118,8 +118,8 @@
 				return ;
 			}
 
+			/** @var kDBItem $message_body */
 			$message_body = $this->Application->recallObject($event->Prefix . '-body', null, Array ('skip_autoload' => true));
-			/* @var $message_body kDBItem */
 
 			// 1. create message body (for sender & recipient)
 			$copy_fields = Array ('Subject', 'Body', 'ShowSignatures', 'DisableSmileys', 'DisableBBCodes');
@@ -149,11 +149,11 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var PostHelper $post_helper */
 			$post_helper = $this->Application->recallObject('PostHelper');
-			/* @var $post_helper PostHelper */
 
 			$options_map = $post_helper->getOptionsMap();
 			$post_options = $object->GetDBField('Options');
@@ -192,8 +192,8 @@
 		{
 			parent::OnBeforeItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$user_id = $this->Application->RecallVar('user_id');
 			$owner_field = ($object->GetDBField('FolderId') == PM_FOLDER_INBOX) ? 'ToId' : 'FromId';
@@ -214,8 +214,8 @@
 		{
 	    	parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$config = $this->Application->getUnitConfig($event->Prefix . '-body');
 
@@ -258,8 +258,8 @@
 		 */
 		protected function checkItemStatus(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() ) {
 				return true;
@@ -283,13 +283,13 @@
 			$reply_to = $this->Application->GetVar('reply_to');
 			$user_id = $this->Application->GetVar('user_id');
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $reply_to > 0 ) {
 				// reply to message
+				/** @var kDBItem $source_msg */
 				$source_msg = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-				/* @var $source_msg kDBItem */
 
 				$source_msg->Load($reply_to);