Index: trunk/kernel/units/reviews/reviews_tag_processor.php
===================================================================
diff -u -N -r8369 -r8441
--- trunk/kernel/units/reviews/reviews_tag_processor.php	(.../reviews_tag_processor.php)	(revision 8369)
+++ trunk/kernel/units/reviews/reviews_tag_processor.php	(.../reviews_tag_processor.php)	(revision 8441)
@@ -47,36 +47,19 @@
 		}
 
 		return parent::Field($params);
-
 	}
 
 	function AlreadyReviewed($params)
 	{
-		$user_id = $this->getUserID();
 		$object =& $this->getObject( Array('skip_autoload' => true) );
-		$product_info = $object->getLinkedInfo();
+		$parent_info = $object->getLinkedInfo();
 
-		$sql = '	SELECT * FROM '.TABLE_PREFIX.'SpamControl
-					WHERE ItemResourceId='.$product_info['ParentId'].'
-					AND IPaddress="'.$_SERVER['REMOTE_ADDR'].'"
-					AND PortalUserId='.$user_id.'
-					AND DataType="Review"';
-		$res = $this->Conn->GetRow($sql);
-		if($res['Expire'] > adodb_mktime())
-		{
-			$ret = 1;
-		}
-		else
-		{
-			$sql = 'DELETE FROM '.TABLE_PREFIX.'SpamControl
-					WHERE ItemResourceId='.$product_info['ParentId'].'
-					AND IPaddress="'.$_SERVER['REMOTE_ADDR'].'"
-					AND PortalUserId='.$user_id.'
-					AND DataType="Review"';
-			$this->Conn->Query($sql);
-			$ret = 0;
-		}
-		return $ret;
+		$spam_helper =& $this->Application->recallObject('SpamHelper');
+		/* @var $spam_helper SpamHelper */
+
+		$spam_helper->InitHelper($parent_info['ParentId'], 'Review', 0);
+
+		return $spam_helper->InSpamControl();
 	}
 
 	function HasError($params)
@@ -89,28 +72,18 @@
 			return 0;
 		}
 	}
-	
+
 	/**
-	 * Returns current user id for reviews, for logic ask Kostja T.
+	 * Preserve main item id in subitem pagination url
 	 *
-	 * @return int
+	 * @param Array $params
+	 * @return string
 	 */
-	function getUserID()
-	{
-		$user_id = $this->Application->RecallVar('user_id');
-		
-		if ($user_id == 0) {
-			$user_id = -2;
-		}
-		
-		return $user_id;
-	}
-	
 	function PageLink($params)
 	{
 		$object =& $this->getObject($params);
 		/* @var kDBList */
-		
+
 		$parent_info = $object->getLinkedInfo();
 		if ($parent_info['ParentId'] > 0) {
 			$params['pass'] = 'm,'.$this->getPrefixSpecial().','.$parent_info['ParentPrefix'];