From 2954836fbacfb1da67da83756f7505f61b75ba73 Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Sun, 30 May 2004 21:04:07 +0000
Subject: [PATCH] - Fixed empty searches being performed. - Fixed empty
searches being logged. - Trim whitespace from start and end of search key.
---
modules/search.module | 11 ++++++-----
modules/search/search.module | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/modules/search.module b/modules/search.module
index dec843da3c4f..790fcca77386 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -339,13 +339,14 @@ function search_view($keys) {
$output .= "<br />". $help_link ."<br />";
}
- // Log the search keys:
- watchdog("search", "search: '$keys'", l("view results", "search", NULL, "keys=". urlencode($keys)));
+ // Only perform search if there is non-whitespace search term:
+ if (trim($keys)) {
+ // Log the search keys:
+ watchdog("search", "search: '$keys'", l("view results", "search", NULL, "keys=". urlencode($keys)));
- // Collect the search results:
- $results = search_data($keys);
+ // Collect the search results:
+ $results = search_data($keys);
- if ($keys) {
if ($results) {
$output .= theme("box", t("Search Results"), $results);
}
diff --git a/modules/search/search.module b/modules/search/search.module
index dec843da3c4f..790fcca77386 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -339,13 +339,14 @@ function search_view($keys) {
$output .= "<br />". $help_link ."<br />";
}
- // Log the search keys:
- watchdog("search", "search: '$keys'", l("view results", "search", NULL, "keys=". urlencode($keys)));
+ // Only perform search if there is non-whitespace search term:
+ if (trim($keys)) {
+ // Log the search keys:
+ watchdog("search", "search: '$keys'", l("view results", "search", NULL, "keys=". urlencode($keys)));
- // Collect the search results:
- $results = search_data($keys);
+ // Collect the search results:
+ $results = search_data($keys);
- if ($keys) {
if ($results) {
$output .= theme("box", t("Search Results"), $results);
}
--
GitLab