Index: trunk/kernel/units/category_items/category_items_event_handler.php
===================================================================
diff -u -N -r4314 -r5431
--- trunk/kernel/units/category_items/category_items_event_handler.php	(.../category_items_event_handler.php)	(revision 4314)
+++ trunk/kernel/units/category_items/category_items_event_handler.php	(.../category_items_event_handler.php)	(revision 5431)
@@ -9,8 +9,7 @@
 		 */
 		function OnSetPrimary(&$event)
 		{
-			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
-			$object =& $event->getObject();
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			$this->StoreSelectedIDs($event);
 			$ids=$this->getSelectedIDs($event);
 			if($ids)
@@ -88,8 +87,7 @@
 			if(!$category_ids) return false;
 			
 			$item_prefix = $event->getEventParam('item_prefix');
-			$this->Application->setUnitOption($item_prefix, 'AutoLoad', false);
-			$item =& $this->Application->recallObject($item_prefix.'.-item');
+			$item =& $this->Application->recallObject($item_prefix.'.-item', null, Array('skip_autoload' => true));
 			
 			$ci_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$item_table = $this->Application->getUnitOption($item_prefix, 'TableName');