Index: branches/RC/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r10396 -r10459
--- branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 10396)
+++ branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 10459)
@@ -775,16 +775,18 @@
 		}
 
 		// linking existing images for item with virtual fields
-		$image_helper =& $this->Application->recallObject('ImageHelper');
-		/* @var $image_helper ImageHelper */
+		if ($event->Prefix != 'cms') {
+			$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'));
@@ -800,21 +802,23 @@
 		}
 
 		if (!$this->Application->IsAdmin()) {
-			$image_helper =& $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
-
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			// process image upload in virtual fields
-			$image_helper->SaveItemImages($object);
+			if ($event->Prefix != 'cms') {
+				$image_helper =& $this->Application->recallObject('ImageHelper');
+				/* @var $image_helper ImageHelper */
 
-			$file_helper =& $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
+				// process image upload in virtual fields
+				$image_helper->SaveItemImages($object);
 
-			// process file upload in virtual fields
-			$file_helper->SaveItemFiles($object);
+				$file_helper =& $this->Application->recallObject('FileHelper');
+				/* @var $file_helper FileHelper */
 
+				// process file upload in virtual fields
+				$file_helper->SaveItemFiles($object);
+			}
+
 			if ($event->Special != '-item') {
 				// don't touch categories during cloning
 				$this->processAdditionalCategories($object, 'update');
@@ -834,21 +838,23 @@
 		}
 
 		if (!$this->Application->IsAdmin()) {
-			$image_helper =& $this->Application->recallObject('ImageHelper');
-			/* @var $image_helper ImageHelper */
-
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			// process image upload in virtual fields
-			$image_helper->SaveItemImages($object);
+			if ($event->Prefix != 'cms') {
+				$image_helper =& $this->Application->recallObject('ImageHelper');
+				/* @var $image_helper ImageHelper */
 
-			$file_helper =& $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
+				// process image upload in virtual fields
+				$image_helper->SaveItemImages($object);
 
-			// process file upload in virtual fields
-			$file_helper->SaveItemFiles($object);
+				$file_helper =& $this->Application->recallObject('FileHelper');
+				/* @var $file_helper FileHelper */
 
+				// process file upload in virtual fields
+				$file_helper->SaveItemFiles($object);
+			}
+
 			if ($event->Special != '-item') {
 				// don't touch categories during cloning
 				$this->processAdditionalCategories($object, 'create');
@@ -2344,11 +2350,15 @@
 	 */
 	function OnAfterConfigRead(&$event)
 	{
-		$file_helper =& $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
+		parent::OnAfterConfigRead($event);
 
-		$file_helper->createItemFiles($event->Prefix, true); // create image fields
-		$file_helper->createItemFiles($event->Prefix, false); // create file fields
+		if ($event->Prefix != 'cms') {
+			$file_helper =& $this->Application->recallObject('FileHelper');
+			/* @var $file_helper FileHelper */
+
+			$file_helper->createItemFiles($event->Prefix, true); // create image fields
+			$file_helper->createItemFiles($event->Prefix, false); // create file fields
+		}
 	}
 
 	/**