--- includes/pager.inc	2008-08-06 21:50:53.000000000 +0200
+++ includes/pager.inc	2008-08-06 21:51:03.000000000 +0200
@@ -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('/SELECT\s+.*?\s+FROM\s+/As', '/ORDER\s+BY\s+.*/'), array('SELECT COUNT(*) FROM ', ''), trim($query));
   }
 
   // Convert comma-separated $page to an array, used by other functions.