Index: branches/5.2.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r14892 -r15127
--- branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 14892)
+++ branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 15127)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 14892 2011-12-20 16:25:05Z alex $
+* @version	$Id: dblist.php 15127 2012-02-22 17:15:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -477,13 +477,13 @@
 	 */
 	public function getCountSQL($sql)
 	{
-		if ( preg_match("/^\s*SELECT\s+DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) )
+		if ( preg_match("/^\s*SELECT\s+DISTINCT(.*?\s)FROM(?!_)/is",$sql,$regs ) )
 		{
-			return preg_replace("/^\s*SELECT\s+DISTINCT(.*?)FROM(?!_)/is", "SELECT COUNT(DISTINCT ".$regs[1].") AS count FROM", $sql);
+			return preg_replace("/^\s*SELECT\s+DISTINCT(.*?\s)FROM(?!_)/is", "SELECT COUNT(DISTINCT ".$regs[1].") AS count FROM", $sql);
 		}
 		else
 		{
-			return preg_replace("/^\s*SELECT(.*?)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql);
+			return preg_replace("/^\s*SELECT(.*?\s)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql);
 		}
 	}
 
@@ -591,13 +591,13 @@
 		$sql = $this->GetSelectSQL(true, false);
 		$fields = str_replace('%1$s', $this->TableName, implode(', ', $fields));
 
-		if ( preg_match("/DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) )
+		if ( preg_match("/DISTINCT(.*?\s)FROM(?!_)/is",$sql,$regs ) )
 		{
-			$sql = preg_replace("/^\s*SELECT DISTINCT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM', $sql);
+			$sql = preg_replace("/^\s*SELECT DISTINCT(.*?\s)FROM(?!_)/is", 'SELECT '.$fields.' FROM', $sql);
 		}
 		else
 		{
-			$sql = preg_replace("/^\s*SELECT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM ', $sql);
+			$sql = preg_replace("/^\s*SELECT(.*?\s)FROM(?!_)/is", 'SELECT '.$fields.' FROM ', $sql);
 		}
 
 		$totals = $this->Conn->Query($sql);