Index: branches/5.2.x/core/units/theme_files/theme_file_eh.php
===================================================================
diff -u -N -r16016 -r16513
--- branches/5.2.x/core/units/theme_files/theme_file_eh.php	(.../theme_file_eh.php)	(revision 16016)
+++ branches/5.2.x/core/units/theme_files/theme_file_eh.php	(.../theme_file_eh.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: theme_file_eh.php 16016 2014-03-19 20:18:21Z alex $
+* @version	$Id: theme_file_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
@@ -63,8 +63,8 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$filename = $this->_getTemplatePath($object);
 
@@ -87,8 +87,8 @@
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$file_data = $object->GetDBField('FileContents');
 
@@ -109,8 +109,8 @@
 		{
 			parent::OnAfterItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$filename = $this->_getTemplatePath($object);
 
@@ -119,8 +119,8 @@
 				fwrite($fp, $object->GetDBField('FileContents'));
 				fclose($fp);
 
+				/** @var kThemesHelper $themes_helper */
 				$themes_helper = $this->Application->recallObject('ThemesHelper');
-				/* @var $themes_helper kThemesHelper */
 
 				$meta_info = $themes_helper->parseTemplateMetaInfo($filename);
 				$file_description = array_key_exists('desc', $meta_info) ? $meta_info['desc'] : '';
@@ -139,8 +139,8 @@
 		 */
 		function _getTemplatePath(&$object)
 		{
+			/** @var kDBItem $theme */
 			$theme = $this->Application->recallObject('theme');
-			/* @var $theme kDBItem */
 
 			$path = FULL_PATH . '/themes/' . $theme->GetDBField('Name');
 
@@ -158,11 +158,11 @@
 		{
 			parent::OnNew($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var TemplateHelper $template_helper */
 			$template_helper = $this->Application->recallObject('TemplateHelper');
-			/* @var $template_helper TemplateHelper */
 
 			$template_helper->InitHelper($object);
 
@@ -179,8 +179,8 @@
 		 */
 		function OnSaveBlock($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if ($items_info) {
@@ -192,8 +192,8 @@
 
 			$status = $object->Validate();
 
+			/** @var TemplateHelper $template_helper */
 			$template_helper = $this->Application->recallObject('TemplateHelper');
-			/* @var $template_helper TemplateHelper */
 
 			$template_helper->InitHelper($object);
 
@@ -221,8 +221,8 @@
 
 			$target_order = $this->Application->GetVar('target_order');
 
+			/** @var TemplateHelper $template_helper */
 			$template_helper = $this->Application->recallObject('TemplateHelper');
-			/* @var $template_helper TemplateHelper */
 
 			if ($template_helper->moveTemplateElements($target_order)) {
 				echo 'OK';