Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -r3757 -r3787
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 3757)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 3787)
@@ -544,7 +544,7 @@
 		if ($special == 'import' || $special == 'export') {
 			$object =& $event->getObject();
 			$image_data = $object->getPrimaryImageData();
-			
+
 			if ($image_data) {
 				$thumbnail_image = $image_data[$image_data['LocalThumb'] ? 'ThumbPath' : 'ThumbUrl'];
 				if ($image_data['SameImages']) {
@@ -558,9 +558,9 @@
 				$object->SetDBField('ImageAlt', $image_data['AltName']);
 			}
 		}
-		
+
 	}
-	
+
 	function OnAfterItemUpdate(&$event)
 	{
 		$this->CalculateHotLimit($event);
@@ -1354,6 +1354,7 @@
 
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$object->SetFieldsFromHash($field_values);
+		$field_values['ImportFilename'] = $object->GetDBField('ImportFilename'); //if upload formatter has renamed the file during moving !!!
 		$object->setID($item_id);
 		$this->setRequiredFields($event);
 
@@ -1553,7 +1554,7 @@
 	{
 		$this->restorePrimaryImage($event);
 	}
-	
+
 	/**
 	 * Create/Update primary image record in info found in imported data
 	 *
@@ -1562,14 +1563,14 @@
 	function restorePrimaryImage(&$event)
 	{
 		$object =& $event->getObject();
-		
+
 		$has_image_info = $object->GetDBField('ImageAlt') && ($object->GetDBField('ThumbnailImage') || $object->GetDBField('FullImage'));
-		if (!$has_image_info) {		
-			return false;		
+		if (!$has_image_info) {
+			return false;
 		}
-		
+
 		$image_data = $object->getPrimaryImageData();
-		
+
 		$image =& $this->Application->recallObject('img', null, Array('skip_autoload' => true));
 		if ($image_data) {
 			$image->Load($image_data['ImageId']);
@@ -1580,38 +1581,38 @@
 			$image->SetDBField('DefaultImg', 1);
 			$image->SetDBField('ResourceId', $object->GetDBField('ResourceId'));
 		}
-		
+
 		$image->SetDBField('AltName', $object->GetDBField('ImageAlt'));
-		
+
 		if ($object->GetDBField('ThumbnailImage')) {
 			$thumbnail_field = $this->isURL( $object->GetDBField('ThumbnailImage') ) ? 'ThumbUrl' : 'ThumbPath';
 			$image->SetDBField($thumbnail_field, $object->GetDBField('ThumbnailImage') );
 			$image->SetDBField('LocalThumb', $thumbnail_field == 'ThumbPath' ? 1 : 0);
 		}
-		
+
 		if (!$object->GetDBField('FullImage')) {
 			$image->SetDBField('SameImages', 1);
 		}
 		else {
 			$image->SetDBField('SameImages', 0);
 			$full_field = $this->isURL( $object->GetDBField('FullImage') ) ? 'Url' : 'LocalPath';
 			$image->SetDBField($full_field, $object->GetDBField('FullImage') );
-			$image->SetDBField('LocalImage', $thumbnail_field == 'LocalPath' ? 1 : 0);
+			$image->SetDBField('LocalImage', $full_field == 'LocalPath' ? 1 : 0);
 		}
-		
+
 		if ($image->isLoaded()) {
 			$image->Update();
 		}
 		else {
 			$image->Create();
 		}
 	}
-	
+
 	function isURL($path)
 	{
 		return preg_match('#(http|https)://(.*)#', $path);
 	}
-	
+
 //	ImportLocalFilename
 
 	function getExportField($field_key)