Index: trunk/kernel/units/reviews/reviews_event_handler.php
===================================================================
diff -u -N -r7635 -r8369
--- trunk/kernel/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 7635)
+++ trunk/kernel/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 8369)
@@ -46,52 +46,47 @@
 		function SetCustomQuery(&$event)
 		{
 			$object =& $event->getObject();
+			
+			if (!$this->Application->IsAdmin()) {
+				$object->addFilter('active', '%1$s.Status = '.STATUS_ACTIVE);
+			}
+			
 			switch ($event->Special)
 			{
 				case 'showall':
 					$object->clearFilters();
 					break;
 
-				case 'products':
-					$object->removeFilter('parent_filter');	// this is important
-					$object->addFilter('product_reviews', '%1$s.ItemId = pr.ResourceId');
-				//	$object->addFilter('active', '%1$s.Status = 1');
-
-					/*$this->Application->setUnitOption('p', 'AutoLoad', true);
-					$product =& $this->Application->recallObject('p');
-					$object->addFilter('current_product', 'pr.ResourceId = '.$product->GetDBField('ResourceId'));*/
-					break;
-
 				case 'item':
 					$object->clearFilters();
 					$info = $object->getLinkedInfo();
 					$this->Application->setUnitOption($info['ParentPrefix'], 'AutoLoad', true);
 					$parent =& $this->Application->recallObject($info['ParentPrefix']);
 					$object->addFilter('item_reviews', '%1$s.ItemId = '.$parent->GetDBField('ResourceId'));
-					$object->addFilter('active', '%1$s.Status = 1');
 					break;
 
+				case 'products':
+					$object->removeFilter('parent_filter');	// this is important
+					$object->addFilter('product_reviews', '%1$s.ItemId = pr.ResourceId');
+					break;
+					
 				case 'product':
 					$object->clearFilters();
 					$object->addFilter('product_reviews', '%1$s.ItemId = pr.ResourceId');
-					$object->addFilter('active', '%1$s.Status = 1');
 					$this->Application->setUnitOption('p', 'AutoLoad', true);
 					$product =& $this->Application->recallObject('p');
 					$object->addFilter('current_product', 'pr.ResourceId = '.$product->GetDBField('ResourceId'));
-
 					break;
 			}
 
-			if($event->getEventParam('type') == 'current_user')
-			{
+			if ($event->getEventParam('type') == 'current_user') {
 				$user_id = $this->getUserID();
 				$ip = $_SERVER['REMOTE_ADDR'];
 				$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);
 				$object->addFilter('current_ip', '%1$s.IPAddress = "'.$ip.'"');
-
 			}
 		}