Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r5431 -r5505
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 5431)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 5505)
@@ -1666,15 +1666,17 @@
 		if ($dst_field == 'ItemCategory') {
 			$object =& $event->getObject(); // category item object (e.g. link, product, etc.)
 
-			$ci_prefix = $object->Prefix.'-ci';
+			$object->assignToCategory($category_id);
+
+			/*$ci_prefix = $object->Prefix.'-ci';
 			$ci_object =& $this->Application->recallObject($ci_prefix, null, Array('skip_autoload' => true));
 
 			$ci_object->Load($category_id);
 			if (!$ci_object->isLoaded()) {
 				$fields_hash = Array('CategoryId' => $category_id, 'ItemResourceId' => $object->GetDBField('ResourceId'));
 				$ci_object->SetDBFieldsFromHash($fields_hash);
 				$ci_object->Create(true);
-			}
+			}*/
 		}
 
 		$this->finalizePopup($event);