Index: branches/5.2.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r14244 -r14572
--- branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 14244)
+++ branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 14572)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: dblist.php 14572 2011-09-20 15:25:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -453,9 +453,9 @@
 	 */
 	public function getCountSQL($sql)
 	{
-		if ( preg_match("/DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) )
+		if ( preg_match("/^\s*SELECT\s+DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) )
 		{
-			return preg_replace("/^\s*SELECT DISTINCT(.*?)FROM(?!_)/is", "SELECT COUNT(DISTINCT ".$regs[1].") AS count FROM", $sql);
+			return preg_replace("/^\s*SELECT\s+DISTINCT(.*?)FROM(?!_)/is", "SELECT COUNT(DISTINCT ".$regs[1].") AS count FROM", $sql);
 		}
 		else
 		{
@@ -564,7 +564,7 @@
 		}
 
 		$sql = $this->GetSelectSQL(true, false);
-		$fields = implode(', ', $fields);
+		$fields = str_replace('%1$s', $this->TableName, implode(', ', $fields));
 
 		if ( preg_match("/DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) )
 		{