Index: branches/RC/core/kernel/db/dblist.php =================================================================== diff -u -r9033 -r9561 --- branches/RC/core/kernel/db/dblist.php (.../dblist.php) (revision 9033) +++ branches/RC/core/kernel/db/dblist.php (.../dblist.php) (revision 9561) @@ -320,11 +320,11 @@ { if ( preg_match("/DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) ) { - return preg_replace("/^.*SELECT DISTINCT(.*?)FROM(?!_)/is", "SELECT COUNT(DISTINCT ".$regs[1].") AS count FROM", $sql); + return preg_replace("/^\s*SELECT DISTINCT(.*?)FROM(?!_)/is", "SELECT COUNT(DISTINCT ".$regs[1].") AS count FROM", $sql); } else { - return preg_replace("/^.*SELECT(.*?)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql); + return preg_replace("/^\s*SELECT(.*?)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql); } }