Index: branches/5.2.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r16379 -r16513
--- branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 16379)
+++ branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 16379 2016-07-25 08:54:53Z alex $
+* @version	$Id: languages_event_handler.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -129,8 +129,8 @@
 				}
 			}
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->massCreateFields();
 			$event->SetRedirectParam('action_completed', 1);
@@ -152,8 +152,9 @@
 			$ids = $this->getSelectedIDs($event);
 			if ($ids) {
 				$id = array_shift($ids);
+
+				/** @var LanguagesItem $object */
 				$object = $event->getObject( Array('skip_autoload' => true) );
-				/* @var $object LanguagesItem */
 
 				$object->Load($id);
 				$object->copyMissingData( $object->setPrimary() );
@@ -171,8 +172,8 @@
 				return ;
 			}
 
+			/** @var LanguagesItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object LanguagesItem */
 
 			$object->SwitchToLive();
 
@@ -267,8 +268,8 @@
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$status_fields = $this->Application->getUnitOption($event->Prefix, 'StatusField');
 			$status_field = array_shift($status_fields);
@@ -304,11 +305,11 @@
 		{
 			parent::OnBeforeItemValidate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kEmailTemplateHelper $email_template_helper */
 			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
-			/* @var $email_template_helper kEmailTemplateHelper */
 
 			$email_template_helper->parseField($object, 'HtmlEmailTemplate');
 			$email_template_helper->parseField($object, 'TextEmailTemplate');
@@ -330,8 +331,8 @@
 		 */
 		protected function setRequired(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->setRequired('HtmlEmailTemplate', !$object->GetDBField('TextEmailTemplate'));
 			$object->setRequired('TextEmailTemplate', !$object->GetDBField('HtmlEmailTemplate'));
@@ -349,17 +350,17 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) ) {
 				$object->addFilter('enabled_filter', '%1$s.Enabled = ' . STATUS_ACTIVE);
 			}
 
 			// site domain language picker
 			if ( $event->Special == 'selected' || $event->Special == 'available' ) {
+				/** @var EditPickerHelper $edit_picker_helper */
 				$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
-				/* @var $edit_picker_helper EditPickerHelper */
 
 				$edit_picker_helper->applyFilter($event, 'Languages');
 			}
@@ -384,8 +385,8 @@
 		{
 			parent::OnAfterItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$src_language = $object->GetDBField('CopyFromLanguage');
 
@@ -429,8 +430,8 @@
 			}
 
 			// create multilingual columns for phrases & email events table first (actual for 6+ language)
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->createFields('phrases');
 			$ml_helper->createFields('email-template');
@@ -469,8 +470,8 @@
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('CopyLabels', 1);
 
@@ -496,8 +497,8 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->setRequired($event);
 		}
@@ -539,8 +540,8 @@
 				$this->Application->StorePersistentVar($language_field, $language_id);
 			}
 			else {
+				/** @var kDBItem $object */
 				$object = $this->Application->recallObject('u.current');
-				/* @var $object kDBItem */
 
 				$object->SetDBField($language_field, $language_id);
 				$object->Update();
@@ -566,8 +567,8 @@
 			if ($items_info) {
 				list ($id, $field_values) = each($items_info);
 
+				/** @var kDBItem $object */
 				$object = $this->Application->recallObject('phrases.import', 'phrases', Array('skip_autoload' => true));
-				/* @var $object kDBItem */
 
 				$object->setID($id);
 				$object->SetFieldsFromHash($field_values);
@@ -585,8 +586,8 @@
 					$event->status = kEvent::erFAIL;
 				}
 
+				/** @var LanguageImportHelper $language_import_helper */
 				$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-				/* @var $language_import_helper LanguageImportHelper */
 
 				$language_import_helper->performImport(
 					$filename,
@@ -638,8 +639,9 @@
 			$items_info = $this->Application->GetVar('phrases_export');
 			if ( $items_info ) {
 				list($id, $field_values) = each($items_info);
+
+				/** @var kDBItem $object */
 				$object = $this->Application->recallObject('phrases.export', null, Array ('skip_autoload' => true));
-				/* @var $object kDBItem */
 
 				$object->setID($id);
 				$object->SetFieldsFromHash($field_values);
@@ -650,8 +652,8 @@
 					return;
 				}
 
+				/** @var FileHelper $file_helper */
 				$file_helper = $this->Application->recallObject('FileHelper');
-				/* @var $file_helper FileHelper */
 
 				$file_helper->CheckFolder(EXPORT_PATH);
 
@@ -668,8 +670,8 @@
 
 				$filename = EXPORT_PATH . '/' . $field_values['LangFile'];
 
+				/** @var LanguageImportHelper $language_import_helper */
 				$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-				/* @var $language_import_helper LanguageImportHelper */
 
 				if ( $object->GetDBField('DoNotEncode') ) {
 					$language_import_helper->setExportEncoding('plain');
@@ -733,8 +735,8 @@
 		{
 			parent::OnBeforeItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $object->GetDBField('PrimaryLang') || $object->GetDBField('AdminInterfaceLang') || $object->GetID() == $this->Application->GetVar('m_lang') ) {
 				$event->status = kEvent::erFAIL;
@@ -752,8 +754,8 @@
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// clean EmailTemplates table
 			$fields_hash = Array (