diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-03-29 03:28:02 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-03-29 03:28:02 +0000 |
| commit | a9091183e1234def7edf03570a15c13fea5262e8 (patch) | |
| tree | 392fe5b64b4637403888b6cad5e816747e1c378e /modules | |
| parent | ab4261dc316baf3455ce3aa87b66d4015cc06f8b (diff) | |
| download | brdo-a9091183e1234def7edf03570a15c13fea5262e8.tar.gz brdo-a9091183e1234def7edf03570a15c13fea5262e8.tar.bz2 | |
- Part of #17747 was not committed (pgsql fixes).
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/search.module | 2 | ||||
| -rw-r--r-- | modules/search/search.module | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/search.module b/modules/search.module index ee2b83895..7b8862239 100644 --- a/modules/search.module +++ b/modules/search.module @@ -512,7 +512,7 @@ function do_search($keywords, $type, $join = '', $where = '1', $variation = true $conditions = $where .' AND ('. implode(' OR ', $words) .')'; // Get result count (for pager) - $count = db_result(db_query("SELECT COUNT(DISTINCT i.sid, i.type) FROM {search_index} i $join WHERE $conditions", $arguments)); + $count = db_num_rows(db_query("SELECT DISTINCT i.sid, i.type FROM {search_index} i $join WHERE $conditions", $arguments)); if ($count == 0) { // Try out a looser search query if nothing was found. if ($variation && $loose = search_keywords_variation($keywords)) { diff --git a/modules/search/search.module b/modules/search/search.module index ee2b83895..7b8862239 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -512,7 +512,7 @@ function do_search($keywords, $type, $join = '', $where = '1', $variation = true $conditions = $where .' AND ('. implode(' OR ', $words) .')'; // Get result count (for pager) - $count = db_result(db_query("SELECT COUNT(DISTINCT i.sid, i.type) FROM {search_index} i $join WHERE $conditions", $arguments)); + $count = db_num_rows(db_query("SELECT DISTINCT i.sid, i.type FROM {search_index} i $join WHERE $conditions", $arguments)); if ($count == 0) { // Try out a looser search query if nothing was found. if ($variation && $loose = search_keywords_variation($keywords)) { |