Index: includes/pager.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/pager.inc,v
retrieving revision 1.61
diff -u -p -r1.61 pager.inc
--- includes/pager.inc  1 May 2007 06:53:02 -0000       1.61
+++ includes/pager.inc  30 Jul 2007 14:58:01 -0000
@@ -62,7 +62,7 @@ function pager_query($query, $limit = 10

   // Construct a count query if none was given.
   if (!isset($count_query)) {
-    $count_query = preg_replace(array('/SELECT.*?FROM /As', '/ORDER BY .*/'), array('SELECT COUNT(*) FROM ', ''), $query);
+    $count_query = preg_replace(array('/(\s+)?SELECT.*?FROM\s/As', '/ORDER BY .*/'), array('SELECT COUNT(*) FROM ', ''), $query);
   }

   // Convert comma-separated $page to an array, used by other functions.