diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-08-12 05:46:37 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-08-12 05:46:37 +0000 |
| commit | d651b9dc3b7c7f81dfdfe1b6dcd1e16c5db48890 (patch) | |
| tree | 6bec92b77bd0f96ecdb53a02ec9cab446799ed2d /includes | |
| parent | 543d8b720857c8dc6ec4d85c4d813b3638e7046f (diff) | |
| download | brdo-d651b9dc3b7c7f81dfdfe1b6dcd1e16c5db48890.tar.gz brdo-d651b9dc3b7c7f81dfdfe1b6dcd1e16c5db48890.tar.bz2 | |
- Patch #7535 by Gerhard: one could not search for the word 'From'.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/pager.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/pager.inc b/includes/pager.inc index 79714eebb..f3546a269 100644 --- a/includes/pager.inc +++ b/includes/pager.inc @@ -55,7 +55,7 @@ function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) { // Count the total number of records in this query. if (!isset($count_query)) { - $count_query = preg_replace(array('/SELECT.*FROM/is', '/ORDER BY .*/'), array('SELECT COUNT(*) FROM', ''), $query); + $count_query = preg_replace(array('/SELECT.*?FROM/As', '/ORDER BY .*/'), array('SELECT COUNT(*) FROM', ''), $query); } $pager_total[$element] = db_result(call_user_func_array('db_query', array_merge(array($count_query), $args))); |