? modules/search/dif
cvs diff: Diffing modules/search
Index: modules/search/search-results.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search-results.tpl.php,v
retrieving revision 1.1
diff -u -p -r1.1 search-results.tpl.php
--- modules/search/search-results.tpl.php	31 Oct 2007 18:06:38 -0000	1.1
+++ modules/search/search-results.tpl.php	12 Dec 2009 22:13:54 -0000
@@ -21,7 +21,13 @@
  * @see template_preprocess_search_results()
  */
 ?>
-<dl class="search-results <?php print $type; ?>-results">
-  <?php print $search_results; ?>
-</dl>
-<?php print $pager; ?>
+<?php if ($search_results) : ?>
+  <h2><?php print t('Search results');?></h2>
+  <dl class="search-results <?php print $type; ?>-results">
+    <?php print $search_results; ?>  
+  </dl>
+  <?php print $pager; ?>
+<?php else : ?>
+  <h2><?php print t('Your search yielded no results');?></h2>
+  <?php print search_help('search#noresults', drupal_help_arg()); ?>
+<?php endif; ?>
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.250.2.8
diff -u -p -r1.250.2.8 search.module
--- modules/search/search.module	7 Dec 2009 15:44:33 -0000	1.250.2.8
+++ modules/search/search.module	12 Dec 2009 22:13:55 -0000
@@ -1157,13 +1157,11 @@ function search_data($keys = NULL, $type
   if (isset($keys)) {
     if (module_hook($type, 'search')) {
       $results = module_invoke($type, 'search', 'search', $keys);
-      if (isset($results) && is_array($results) && count($results)) {
-        if (module_hook($type, 'search_page')) {
-          return module_invoke($type, 'search_page', $results);
-        }
-        else {
-          return theme('search_results', $results, $type);
-        }
+      if (module_hook($type, 'search_page')) {
+        return module_invoke($type, 'search_page', $results);
+      }
+      else {
+        return theme('search_results', $results, $type);
       }
     }
   }
Index: modules/search/search.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.pages.inc,v
retrieving revision 1.4
diff -u -p -r1.4 search.pages.inc
--- modules/search/search.pages.inc	6 Dec 2007 09:51:01 -0000	1.4
+++ modules/search/search.pages.inc	12 Dec 2009 22:13:55 -0000
@@ -30,13 +30,6 @@ function search_view($type = 'node') {
 
       // Collect the search results:
       $results = search_data($keys, $type);
-
-      if ($results) {
-        $results = theme('box', t('Search results'), $results);
-      }
-      else {
-        $results = theme('box', t('Your search yielded no results'), search_help('search#noresults', drupal_help_arg()));
-      }
     }
 
     // Construct the search form.
