- Fixed bug 5532: search broken if any subsearch returns without results.

  Patch by Goba.

1 files changed, 7 insertions, 4 deletions

diff --git a/includes/common.inc b/includes/common.inc
index ab5317276..3afdf3cfd 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -663,10 +663,13 @@ function search_data($keys = NULL) {
 
   if (isset($keys)) {
     foreach (module_list() as $name) {
-      if (module_hook($name, "search") && (!$edit["type"] || $edit["type"][$name]) && ($result = module_invoke($name, "search", $keys))) {
-        $output .= "<h2>$result[0]</h2>";
-        foreach ($result[1] as $entry) {
-          $output .= search_item($entry, $name);
+      if (module_hook($name, "search") && (!$edit["type"] || $edit["type"][$name])) {
+        list($title, $results) = module_invoke($name, "search", $keys);
+        if ($results) {
+          $output .= "<h2>$title</h2>";
+          foreach ($results as $entry) {
+            $output .= search_item($entry, $name);
+          }
         }
       }
     }