Index: branches/unlabeled/unlabeled-1.35.2/core/units/general/cat_event_handler.php
===================================================================
diff -u -r4070 -r4178
--- branches/unlabeled/unlabeled-1.35.2/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4070)
+++ branches/unlabeled/unlabeled-1.35.2/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4178)
@@ -1422,8 +1422,18 @@
 			$event->redirect = false;
 		}
 	}
-
+	
 	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnExportCancel(&$event)
+	{
+		$this->OnGoBack($event);
+	}
+	
+	/**
 	 * Sets correct available & export fields
 	 *
 	 * @param kEvent $event
@@ -1730,6 +1740,15 @@
 		$event->redirect = false;
 		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 		if ($items_info) {
+			list($id, $field_values) = each($items_info);
+			
+			$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 !!!
+			$field_values['ImportSource'] = 2;
+			$field_values['ImportLocalFilename'] = $object->GetDBField('ImportFilename');
+			$items_info[$id] = $field_values;
+			
 			$this->Application->StoreVar($event->getPrefixSpecial().'_ItemsInfo', serialize($items_info));
 		}
 	}