Index: branches/5.2.x/core/install/upgrades.php
===================================================================
diff -u -N -r16295 -r16513
--- branches/5.2.x/core/install/upgrades.php	(.../upgrades.php)	(revision 16295)
+++ branches/5.2.x/core/install/upgrades.php	(.../upgrades.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 16295 2015-10-25 17:49:33Z alex $
+* @version	$Id: upgrades.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -70,8 +70,8 @@
 			}
 
 			if ($mode == 'after') {
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				$this->Application->UnitConfigReader->iterateConfigs(Array (&$this, 'updateTextFields'), $ml_helper->getLanguages());
 			}
@@ -658,8 +658,8 @@
 			// Tables: PageContent, Images
 			if ($this->Conn->TableFound('PageContent', true)) {
 				// 1. replaces "/kernel/user_files/" references in content blocks
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				$languages = $ml_helper->getLanguages();
 				$replace_sql = '%1$s = REPLACE(%1$s, "/kernel/user_files/", "/system/user_files/")';
@@ -844,8 +844,8 @@
 
 			// make sure, that all categories have valid value for Priority field
 
+			/** @var kPriorityHelper $priority_helper */
 			$priority_helper = $this->Application->recallObject('PriorityHelper');
-			/* @var $priority_helper kPriorityHelper */
 
 			$event = new kEvent('c:OnListBuild');
 
@@ -881,8 +881,8 @@
 		 */
 		function _fixSkinColors()
 		{
+			/** @var kDBItem $skin */
 			$skin = $this->Application->recallObject('skin', null, Array ('skip_autoload' => 1));
-			/* @var $skin kDBItem */
 
 			$skin->Load(1, 'IsPrimary');
 			if ($skin->isLoaded()) {
@@ -915,8 +915,8 @@
 					$skin->SetDBField('Options', serialize($skin_options));
 					$skin->Update();
 
+					/** @var SkinHelper $skin_helper */
 					$skin_helper = $this->Application->recallObject('SkinHelper');
-					/* @var $skin_helper SkinHelper */
 
 					$skin_file = $skin_helper->getSkinPath();
 					if (file_exists($skin_file)) {
@@ -1335,8 +1335,8 @@
 				}
 
 				// replace data in category custom fields used for category item template storage
+				/** @var kRewriteUrlProcessor $rewrite_processor */
 				$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-				/* @var $rewrite_processor kRewriteUrlProcessor */
 
 				foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 					$custom_field_id = $rewrite_processor->getItemTemplateCustomField($module_info['Var']);
@@ -1435,8 +1435,8 @@
 					}
 				}
 
+				/** @var kPermCacheUpdater $updater */
 				$updater = $this->Application->makeClass('kPermCacheUpdater');
-				/* @var $updater kPermCacheUpdater */
 
 				$updater->OneStepRun();
 			}
@@ -1481,16 +1481,16 @@
 				$this->Conn->Query($sql);
 
 				// create multilingual fields for phrases and email events
+				/** @var kMultiLanguageHelper $ml_helper */
 				$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-				/* @var $ml_helper kMultiLanguageHelper */
 
 				$ml_helper->createFields('phrases');
 				$ml_helper->createFields('email-template');
 				$languages = $ml_helper->getLanguages();
 
 				if ($this->Conn->TableFound(TABLE_PREFIX . 'EmailMessage', true)) {
+					/** @var kEmailTemplateHelper $email_template_helper */
 					$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
-					/* @var $email_template_helper kEmailTemplateHelper */
 
 					foreach ($languages as $language_id) {
 						$sql = 'SELECT EmailMessageId, Template, EventId
@@ -1618,8 +1618,8 @@
 						ADD INDEX (StateCountryId)';
 			$this->Conn->Query($sql);
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->createFields('country-state');
 			$languages = $ml_helper->getLanguages();
@@ -1649,8 +1649,8 @@
 		 */
 		function _replaceConfigurationValueSeparator()
 		{
+			/** @var InpCustomFieldsHelper $custom_field_helper */
 			$custom_field_helper = $this->Application->recallObject('InpCustomFieldsHelper');
-			/* @var $custom_field_helper InpCustomFieldsHelper */
 
 			$sql = 'SELECT ValueList, VariableName
 					FROM ' . TABLE_PREFIX . 'ConfigurationAdmin
@@ -1689,8 +1689,8 @@
 					WHERE FromUserId IS NOT NULL AND (FromUserId <> ' . USER_ROOT . ')';
 			$events = $this->Conn->Query($sql, 'EventId');
 
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			foreach ($events as $event_id => $event_data) {
 				$sql = 'SELECT Login
@@ -1949,8 +1949,8 @@
 			$source_phrases = $this->getPhrasesByMask($source_prefix . '%');
 			$target_phrases = $this->getPhrasesByMask($target_prefix . '%');
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$delete_ids = Array ();
 			$ml_helper->createFields('phrases');
@@ -2068,8 +2068,8 @@
 				return;
 			}
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$languages = $ml_helper->getLanguages();
 			$ml_helper->createFields('email-template');
@@ -2111,8 +2111,8 @@
 		 */
 		private function _migrateCommonFooter()
 		{
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$languages = $ml_helper->getLanguages();
 
@@ -2174,8 +2174,8 @@
 				return;
 			}
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			// make some promo block fields translatable
 			$ml_helper->createFields('promo-block');
@@ -2331,8 +2331,8 @@
 
 			kUtil::setResourceLimit();
 
+			/** @var kPasswordFormatter $password_formatter */
 			$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-			/* @var $password_formatter kPasswordFormatter */
 
 			foreach ($user_passwords as $user_id => $user_password) {
 				$fields_hash = Array (