From 928435a565a58facca9c01d1fc186b5e3cfc0a2c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 1 Feb 2004 19:07:36 +0000
Subject: - Fixed bug 5532: search broken if any subsearch returns without
 results.   Patch by Goba.

---
 includes/common.inc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'includes')

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);
+          }
         }
       }
     }
-- 
cgit v1.2.3