Index: branches/5.0.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r13233 -r13243
--- branches/5.0.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 13233)
+++ branches/5.0.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 13243)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_tag_processor.php 13233 2010-03-15 22:00:38Z dmitrya $
+* @version	$Id: db_tag_processor.php 13243 2010-03-17 08:58:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -618,12 +618,25 @@
 	function MoreLink($params)
 	{
 		$per_page = $this->SelectParam($params, 'per_page,max_items');
-		if ($per_page !== false) $params['per_page'] = $per_page;
+
+		if ($per_page !== false) {
+			$params['per_page'] = $per_page;
+		}
+
 		$list =& $this->GetList($params);
-		if ($list->PerPage < $list->RecordsCount) {
-			$block_params = $this->prepareTagParams($params);
-			$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 
+		if ($list->Counted) {
+			$has_next_page = $list->Page < $list->GetTotalPages();
+		}
+		else {
+			$has_next_page = $list->PerPage < $list->RecordsCount;
+		}
+
+		if ($has_next_page) {
+			$block_params = Array (
+				'name' => $this->SelectParam($params, 'render_as,block'),
+			);
+
 			return $this->Application->ParseBlock($block_params);
 		}
 	}