Index: trunk/core/units/reviews/reviews_event_handler.php
===================================================================
diff -u -N -r5219 -r5431
--- trunk/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 5219)
+++ trunk/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 5431)
@@ -86,8 +86,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);
@@ -105,13 +104,11 @@
 		{
 			$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) );
 			$parent_info = $object->getLinkedInfo();
 			$review_fields = $this->Application->GetVar($event->getPrefixSpecial(true));
-
+			
 			$sql = '	SELECT * FROM '.TABLE_PREFIX.'SpamControl
 						WHERE ItemResourceId='.$parent_info['ParentId'].'
 						AND IPaddress="'.$_SERVER['REMOTE_ADDR'].'"