Index: branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r16339 -r16513
--- branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 16339)
+++ branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upload_formatter.php 16339 2016-04-02 13:45:52Z alex $
+* @version	$Id: upload_formatter.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -222,8 +222,8 @@
 					$storage_format = isset($options['storage_format']) ? $options['storage_format'] : false;
 
 					if ( $storage_format ) {
+						/** @var ImageHelper $image_helper */
 						$image_helper = $this->Application->recallObject('ImageHelper');
-						/* @var $image_helper ImageHelper */
 
 						move_uploaded_file($value['tmp_name'], $value['tmp_name'] . '.jpg'); // add extension, so ResizeImage can work
 						$url = $image_helper->ResizeImage($value['tmp_name'] . '.jpg', $storage_format);
@@ -448,8 +448,8 @@
 		$file_path = strlen($value) ? FULL_PATH . str_replace('/', DIRECTORY_SEPARATOR, $upload_dir) . $value : '';
 
 		if ( preg_match('/resize:([\d]*)x([\d]*)/', $format, $regs) ) {
+			/** @var ImageHelper $image_helper */
 			$image_helper = $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
 
 			try {
 				return $image_helper->ResizeImage($file_path, $format);
@@ -499,8 +499,8 @@
 				break;
 
 			case 'img_size':
+				/** @var ImageHelper $image_helper */
 				$image_helper = $this->Application->recallObject('ImageHelper');
-				/* @var $image_helper ImageHelper */
 
 				$image_info = $image_helper->getImageInfo($file_path);
 				return $image_info ? $image_info[3] : '';