Index: branches/5.3.x/core/units/helpers/cat_dbitem_export_helper.php
===================================================================
diff -u -N -r16395 -r16519
--- branches/5.3.x/core/units/helpers/cat_dbitem_export_helper.php	(.../cat_dbitem_export_helper.php)	(revision 16395)
+++ branches/5.3.x/core/units/helpers/cat_dbitem_export_helper.php	(.../cat_dbitem_export_helper.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_dbitem_export_helper.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: cat_dbitem_export_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
@@ -162,8 +162,8 @@
 		function fillRequiredFields($event, &$object, $set_status = false)
 		{
 			if ( $object == $this->false ) {
+				/** @var kCatDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kCatDBItem */
 			}
 
 			$has_empty = false;
@@ -193,8 +193,8 @@
 
 				if ( $formatter_class ) {
 					// not tested
+					/** @var kFormatter $formatter */
 					$formatter = $this->Application->recallObject($formatter_class);
-					/* @var $formatter kFormatter */
 
 					$sample_value = $formatter->GetSample($field_name, $field_options, $object);
 				}
@@ -226,8 +226,8 @@
 
 			$this->fillRequiredFields($event, $this->false);
 
+			/** @var kCatDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kCatDBItem */
 
 			$cross_unique_fields = Array('FieldsSeparatedBy', 'FieldsEnclosedBy');
 			if (($object->GetDBField('CategoryFormat') == 1) || ($event->Special == 'import')) // in one field
@@ -404,8 +404,8 @@
 		 */
 		function openFile($event)
 		{
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$file_helper->CheckFolder(EXPORT_PATH);
 
@@ -439,8 +439,8 @@
 
 		function getCustomSQL()
 		{
+			/** @var kMultiLanguage $ml_formatter */
 			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
 
 			$custom_sql = '';
 
@@ -1124,8 +1124,8 @@
 			$category_path = $this->getFromCache('category_path', $category_id);
 
 			if ( !$category_path ) {
+				/** @var kMultiLanguage $ml_formatter */
 				$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-				/* @var $ml_formatter kMultiLanguage */
 
 				$sql = 'SELECT ' . $ml_formatter->LangFieldName('CachedNavbar') . '
 						FROM ' . TABLE_PREFIX . 'Categories
@@ -1266,8 +1266,8 @@
 		 */
 		function prepareExportColumns($event)
 		{
+			/** @var kCatDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kCatDBItem */
 
 			if ( !$object->isField('ExportColumns') ) {
 				// import/export prefix was used (see kDBEventHandler::prepareObject) but object don't plan to be imported/exported
@@ -1300,8 +1300,8 @@
 				}
 			}
 
+			/** @var kDBEventHandler $handler */
 			$handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
-			/* @var $handler kDBEventHandler */
 
 			$available_columns = array_merge($available_columns, $handler->getCustomExportColumns($event));
 
@@ -1350,8 +1350,8 @@
 		 */
 		function PrepareExportPresets($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$options = $object->GetFieldOptions('ExportPresets');
 			$export_settings = $this->Application->RecallPersistentVar('export_settings');
@@ -1403,14 +1403,14 @@
 				return ;
 			}
 
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$import_filenames = Array ();
 			$file_helper->CheckFolder(EXPORT_PATH);
 
 			$iterator = new DirectoryIterator(EXPORT_PATH);
-			/* @var $file_info DirectoryIterator */
+			/** @var DirectoryIterator $file_info */
 
 			foreach ($iterator as $file_info) {
 				$file = $file_info->getFilename();
@@ -1422,8 +1422,8 @@
 				$import_filenames[$file] = $file . ' (' . kUtil::formatSize( $file_info->getSize() ) . ')';
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetFieldOption('ImportLocalFilename', 'options', $import_filenames);
 		}
@@ -1458,8 +1458,8 @@
 
 			list($item_id, $field_values) = each($items_info);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->SetFieldsFromHash($field_values);
 			$field_values['ImportFilename'] = $object->GetDBField('ImportFilename'); //if upload formatter has renamed the file during moving !!!
@@ -1560,8 +1560,8 @@
 
 			$required_fields['export'] = Array('ExportFormat', 'ExportFilename','ExportColumns');
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ($this->_getExportSavePreset($object)) {
 				$required_fields['export'][] = 'ExportPresetName';