Index: branches/5.2.x/core/units/helpers/image_helper.php
===================================================================
diff -u -N -r14092 -r14095
--- branches/5.2.x/core/units/helpers/image_helper.php	(.../image_helper.php)	(revision 14092)
+++ branches/5.2.x/core/units/helpers/image_helper.php	(.../image_helper.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: image_helper.php 14092 2010-11-26 22:43:15Z alex $
+* @version	$Id: image_helper.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -23,9 +23,9 @@
 		 */
 		var $fileHelper = null;
 
-		function ImageHelper()
+		public function __construct()
 		{
-			parent::kHelper();
+			parent::__construct();
 
 			$this->fileHelper =& $this->Application->recallObject('FileHelper');
 		}
@@ -571,10 +571,10 @@
 				$image_path = $item_image['ThumbPath'];
 				if ($item_image['DefaultImg'] == 1 || $item_image['Name'] == 'main') {
 					// process primary image separately
-					if (array_key_exists('PrimaryImage', $object->Fields)) {
+					if ( $object->isField('PrimaryImage') ) {
 						$object->SetDBField('PrimaryImage', $image_path);
 						$object->SetOriginalField('PrimaryImage', $image_path);
-						$object->Fields['PrimaryImage']['original_field'] = $item_image['Name'];
+						$object->SetFieldOption('PrimaryImage', 'original_field', $item_image['Name']);
 
 						$this->_loadCustomFields($object, $item_image, 0);
 					}
@@ -586,10 +586,10 @@
 					$image_counter = abs($item_image['Priority']);
 				}
 
-				if (array_key_exists('Image'.$image_counter, $object->Fields)) {
+				if ( $object->isField('Image'.$image_counter) ) {
 					$object->SetDBField('Image'.$image_counter, $image_path);
 					$object->SetOriginalField('Image'.$image_counter, $image_path);
-					$object->Fields['Image'.$image_counter]['original_field'] = $item_image['Name'];
+					$object->SetFieldOption('Image'.$image_counter, 'original_field', $item_image['Name']);
 
 					$this->_loadCustomFields($object, $item_image, $image_counter);
 				}