Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Part of #17747 was not committed (pgsql fixes).

4.6.x
Steven Wittens 2005-03-29 03:28:02 +00:00
parent ab4261dc31
commit a9091183e1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/search.module
View File

@ -512,7 +512,7 @@ function do_search($keywords, $type, $join = '', $where = '1', $variation = true
$conditions = $where .' AND ('. implode(' OR ', $words) .')'; $conditions = $where .' AND ('. implode(' OR ', $words) .')';
// Get result count (for pager) // 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) { if ($count == 0) {
// Try out a looser search query if nothing was found. // Try out a looser search query if nothing was found.
if ($variation && $loose = search_keywords_variation($keywords)) { if ($variation && $loose = search_keywords_variation($keywords)) {

2
modules/search/search.module
View File

@ -512,7 +512,7 @@ function do_search($keywords, $type, $join = '', $where = '1', $variation = true
$conditions = $where .' AND ('. implode(' OR ', $words) .')'; $conditions = $where .' AND ('. implode(' OR ', $words) .')';
// Get result count (for pager) // 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) { if ($count == 0) {
// Try out a looser search query if nothing was found. // Try out a looser search query if nothing was found.
if ($variation && $loose = search_keywords_variation($keywords)) { if ($variation && $loose = search_keywords_variation($keywords)) {