Index: branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_event_handler.php
===================================================================
diff -u -r4935 -r5428
--- branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 4935)
+++ branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 5428)
@@ -73,8 +73,7 @@
 			{
 				$user_id = $this->Application->GetVar('u_id') ? $this->Application->GetVar('u_id') : -2;
 				$ip = $_SERVER['REMOTE_ADDR'];
-				$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
-				$object =& $event->getObject();
+				$object =& $event->getObject( Array('skip_autoload' => true) );
 				$product_info = $object->getLinkedInfo();
 				$object->addFilter('current_item', '%1$s.ItemId = '.$product_info['ParentId']);
 				$object->addFilter('current_user', '%1$s.CreatedById = '.$user_id);
@@ -92,9 +91,8 @@
 		{
 			$user_id = ($this->Application->GetVar('u_id') == 0) ? -2 : $this->Application->GetVar('u_id');
 			$event->redirect_params = Array('pass' => 'all,p');
-
-			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
-			$object =& $event->getObject();
+			
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			$item_info = $this->Application->GetVar('rev_product');
 			$product_info = $object->getLinkedInfo();