Index: branches/5.3.x/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r16111 -r16519
--- branches/5.3.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 16111)
+++ branches/5.3.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_event_handler.php 16111 2014-12-07 14:49:01Z alex $
+* @version	$Id: phrases_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
@@ -47,8 +47,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$object->addFilter('module_filter', '%1$s.Module IN (SELECT Name FROM ' . TABLE_PREFIX . 'Modules WHERE Loaded = 1)');
 		}
@@ -152,8 +152,8 @@
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->_setPhraseModule($object);
 		}
@@ -169,8 +169,8 @@
 		{
 			parent::OnNew($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$label = $this->Application->GetVar($event->getPrefixSpecial() . '_label');
 
@@ -237,8 +237,8 @@
 		protected function OnCreate(kEvent $event)
 		{
 			if ( $this->Application->GetVar($event->Prefix . '_label') ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject(Array ('skip_autoload' => true));
-				/* @var $object kDBItem */
 
 				if ( $this->Application->GetVar('m_lang') != $this->Application->GetVar('lang_id') ) {
 					$object->SwitchToLive();
@@ -259,8 +259,8 @@
 		 */
 		protected function OnCreateAjax(kEvent $event)
 		{
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$ajax_form_helper->transitEvent($event, 'OnCreate');
 		}
@@ -290,8 +290,8 @@
 		 */
 		protected function OnUpdateAjax(kEvent $event)
 		{
+			/** @var AjaxFormHelper $ajax_form_helper */
 			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
-			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$ajax_form_helper->transitEvent($event, 'OnUpdate');
 		}
@@ -324,8 +324,8 @@
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$primary_language_id = $this->Application->GetDefaultLanguageId();
 
@@ -368,8 +368,8 @@
 		 */
 		function _phraseChanged($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$label = $object->GetDBField('Phrase');
 			$object->SetDBField('PhraseKey', mb_strtoupper($label));