Index: branches/RC/core/kernel/db/dblist.php
===================================================================
diff -u -N -r9907 -r10028
--- branches/RC/core/kernel/db/dblist.php	(.../dblist.php)	(revision 9907)
+++ branches/RC/core/kernel/db/dblist.php	(.../dblist.php)	(revision 10028)
@@ -397,11 +397,11 @@
 
 		if ( preg_match("/DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) )
 		{
-			$sql = preg_replace("/^.*SELECT DISTINCT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM', $sql);
+			$sql = preg_replace("/^\s*SELECT DISTINCT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM', $sql);
 		}
 		else
 		{
-			$sql = preg_replace("/^.*SELECT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM ', $sql);
+			$sql = preg_replace("/^\s*SELECT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM ', $sql);
 		}
 
 		$totals = $this->Conn->Query($sql);