Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r8686 -r8687
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 8686)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 8687)
@@ -702,26 +702,10 @@
 		}
 
 		// linking existing images for item with virtual fields
-		$sql = 'SELECT *
-				FROM '.TABLE_PREFIX.'Images
-				WHERE ResourceId = '.$object->GetDBField('ResourceId').'
-				ORDER BY ImageId ASC';
-		$item_images = $this->Conn->Query($sql);
+		$image_helper =& $this->Application->recallObject('ImageHelper');
+		/* @var $image_helper ImageHelper */
 
-		$image_counter = 1;
-		foreach ($item_images as $item_image) {
-			$image_path = preg_replace('/^'.preg_quote(IMAGES_PATH, '/').'(.*)/', '\\1', $item_image['ThumbPath']);
-			if ($item_image['DefaultImg'] == 1 || $item_image['Name'] == 'main') {
-				// process primary image separately
-				$object->SetDBField('PrimaryImage', $image_path);
-				$object->Fields['PrimaryImage']['original_field'] = $item_image['Name'];
-				continue;
-			}
-
-			$object->SetDBField('Image'.$image_counter, $image_path);
-			$object->Fields['Image'.$image_counter]['original_field'] = $item_image['Name'];
-			$image_counter++;
-		}
+		$image_helper->LoadItemImages($object);
 	}
 
 	function OnAfterItemUpdate(&$event)