Index: branches/5.3.x/core/units/helpers/language_import_helper.php
===================================================================
diff -u -N -r16395 -r16519
--- branches/5.3.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 16395)
+++ branches/5.3.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: language_import_helper.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: language_import_helper.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -846,7 +846,7 @@
 				$container_nodes = Array ('PHRASES', 'EVENTS', 'COUNTRIES');
 
 				foreach ($language_node as $sub_node) {
-					/* @var $sub_node SimpleXMLElement */
+					/** @var SimpleXMLElement $sub_node */
 
 					if ( in_array($sub_node->getName(), $container_nodes) ) {
 							continue;
@@ -882,8 +882,8 @@
 			}
 
 			if ( !defined('IS_INSTALL') || !IS_INSTALL ) {
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				// create ML columns for new languages
 				$ml_helper->resetState();
@@ -908,7 +908,7 @@
 				$container_nodes = Array ('PHRASES', 'EVENTS', 'COUNTRIES');
 
 				foreach ($language_node as $sub_node) {
-					/* @var $sub_node SimpleXMLElement */
+					/** @var SimpleXMLElement $sub_node */
 
 					if ( !in_array($sub_node->getName(), $container_nodes) || !count($sub_node->children()) ) {
 						// PHP 5.3 version would be: !$sub_node->count()
@@ -969,7 +969,7 @@
 			}
 
 			foreach ($phrases as $phrase_node) {
-				/* @var $phrase_node SimpleXMLElement */
+				/** @var SimpleXMLElement $phrase_node */
 
 				$phrase_key = mb_strtoupper($phrase_node['Label']);
 
@@ -1040,11 +1040,11 @@
 				$this->Application->Debugger->profileStart('L[' . $language_id . ']E', 'Language: ' . $language_id . '; Events Import');
 			}
 
+			/** @var kEmailTemplateHelper $email_template_helper */
 			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
-			/* @var $email_template_helper kEmailTemplateHelper */
 
 			foreach ($events as $event_node) {
-				/* @var $event_node SimpleXMLElement */
+				/** @var SimpleXMLElement $event_node */
 
 				$message_type = (string)$event_node['MessageType'];
 				$email_template_id = $this->_getEmailTemplateId((string)$event_node['Event'], (int)$event_node['Type']);
@@ -1121,7 +1121,7 @@
 			static $other_translations = Array ();
 
 			foreach ($country_states as $country_state_node) {
-				/* @var $country_state_node SimpleXMLElement */
+				/** @var SimpleXMLElement $country_state_node */
 
 				if ( $process_states ) {
 					$country_state_id = $this->_getStateId((string)$country_states['Iso'], (string)$country_state_node['Iso']);
@@ -1293,8 +1293,8 @@
 				'per_page' => -1
 			);
 
+			/** @var kDBList $list */
 			$list = $this->Application->recallObject($prefix, $prefix . '_List', $tag_params);
-			/* @var $list kDBList */
 
 			$sql = $list->getCountSQL($list->GetSelectSQL());
 			$sql = str_replace('COUNT(*) AS count', $list->TableName . '.' . $list->IDField, $sql);