Index: branches/RC/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r11855 -r11857
--- branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 11855)
+++ branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 11857)
@@ -912,18 +912,16 @@
 		}
 
 		// linking existing images for item with virtual fields
-		if ($event->Prefix != 'cms') {
-			$image_helper =& $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
+		$image_helper =& $this->Application->recallObject('ImageHelper');
+		/* @var $image_helper ImageHelper */
 
-			$image_helper->LoadItemImages($object);
+		$image_helper->LoadItemImages($object);
 
-			// linking existing files for item with virtual fields
-			$file_helper =& $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
+		// linking existing files for item with virtual fields
+		$file_helper =& $this->Application->recallObject('FileHelper');
+		/* @var $file_helper FileHelper */
 
-			$file_helper->LoadItemFiles($object);
-		}
+		$file_helper->LoadItemFiles($object);
 
 		// set item's additional categories to virtual field (used in editing)
 		$item_categories = $this->getItemCategories($object->GetDBField('ResourceId'));
@@ -942,19 +940,17 @@
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if ($event->Prefix != 'cms') {
-				$image_helper =& $this->Application->recallObject('ImageHelper');
-				/* @var $image_helper ImageHelper */
+			$image_helper =& $this->Application->recallObject('ImageHelper');
+			/* @var $image_helper ImageHelper */
 
-				// process image upload in virtual fields
-				$image_helper->SaveItemImages($object);
+			// process image upload in virtual fields
+			$image_helper->SaveItemImages($object);
 
-				$file_helper =& $this->Application->recallObject('FileHelper');
-				/* @var $file_helper FileHelper */
+			$file_helper =& $this->Application->recallObject('FileHelper');
+			/* @var $file_helper FileHelper */
 
-				// process file upload in virtual fields
-				$file_helper->SaveItemFiles($object);
-			}
+			// process file upload in virtual fields
+			$file_helper->SaveItemFiles($object);
 
 			if ($event->Special != '-item') {
 				// don't touch categories during cloning
@@ -978,19 +974,17 @@
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if ($event->Prefix != 'cms') {
-				$image_helper =& $this->Application->recallObject('ImageHelper');
-				/* @var $image_helper ImageHelper */
+			$image_helper =& $this->Application->recallObject('ImageHelper');
+			/* @var $image_helper ImageHelper */
 
-				// process image upload in virtual fields
-				$image_helper->SaveItemImages($object);
+			// process image upload in virtual fields
+			$image_helper->SaveItemImages($object);
 
-				$file_helper =& $this->Application->recallObject('FileHelper');
-				/* @var $file_helper FileHelper */
+			$file_helper =& $this->Application->recallObject('FileHelper');
+			/* @var $file_helper FileHelper */
 
-				// process file upload in virtual fields
-				$file_helper->SaveItemFiles($object);
-			}
+			// process file upload in virtual fields
+			$file_helper->SaveItemFiles($object);
 
 			if ($event->Special != '-item') {
 				// don't touch categories during cloning
@@ -2473,9 +2467,7 @@
 	{
 		$object =& $event->getObject();
 		if (!$object->isLoaded()) {
-			if ($object->Prefix != 'cms') {
-				$this->_errorNotFound($event);
-			}
+			$this->_errorNotFound($event);
 
 			return true;
 		}