Index: branches/5.3.x/core/kernel/utility/email.php
===================================================================
diff -u -N -r16503 -r16519
--- branches/5.3.x/core/kernel/utility/email.php	(.../email.php)	(revision 16503)
+++ branches/5.3.x/core/kernel/utility/email.php	(.../email.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email.php 16503 2016-12-26 18:16:21Z alex $
+ * @version	$Id: email.php 16519 2017-01-20 20:21:46Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -432,12 +432,12 @@
 					$this->fromEmail = $user_info['Email'];
 					$this->fromName = trim($user_info['FirstName'] . ' ' . $user_info['LastName']);
 
+					/** @var UsersItem $user */
 					$user = $this->Application->recallObject(
 						'u.email-from',
 						null,
 						array('live_table' => true, 'skip_autoload' => true)
 					);
-					/* @var $user UsersItem */
 
 					$user->Load($user_info['PortalUserId']);
 				}
@@ -536,8 +536,8 @@
 			return false;
 		}
 
+		/** @var MInputHelper $minput_helper */
 		$minput_helper = $this->Application->recallObject('MInputHelper');
-		/* @var $minput_helper MInputHelper */
 
 		// group recipients by type
 		$records = $minput_helper->parseMInputXML($xml);
@@ -606,12 +606,12 @@
 
 		array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $add_recipient);
 
+		/** @var UsersItem $user */
 		$user = $this->Application->recallObject(
 			'u.email-to',
 			null,
 			array('live_table' => true, 'skip_autoload' => true)
 		);
-		/* @var $user UsersItem */
 
 		$user->Load($this->recipientUserId);
 	}
@@ -790,8 +790,8 @@
 		$language_id = $restore ? $prev_language_id : $this->params['language_id'];
 		$this->Application->SetVar('m_lang', $language_id);
 
+		/** @var LanguagesItem $language */
 		$language = $this->Application->recallObject('lang.current');
-		/* @var $language LanguagesItem */
 
 		$language->Load($language_id);
 
@@ -842,8 +842,8 @@
 		$design_key = 'L' . $this->params['language_id'] . ':' . ($is_html ? 'html' : 'text');
 
 		if ( !isset($design_templates[$design_key]) ) {
+			/** @var LanguagesItem $language */
 			$language = $this->Application->recallObject('lang.current');
-			/* @var $language LanguagesItem */
 
 			$design_template = $language->GetDBField($is_html ? 'HtmlEmailTemplate' : 'TextEmailTemplate');
 
@@ -913,8 +913,8 @@
 		$text = $this->Application->Parser->Parse($this->_normalizeLineEndings($text), $template_name);
 		$this->Application->Parser->SetParams($parser_params); // restore parser params
 
+		/** @var CategoryHelper $category_helper */
 		$category_helper = $this->Application->recallObject('CategoryHelper');
-		/* @var $category_helper CategoryHelper */
 
 		return $category_helper->replacePageIds($is_html ? $this->_removeTrailingLineEndings($text) : $text);
 	}