From 76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 25 May 2009 10:43:54 +0000
Subject: - Patch #470594 by Moshe: convert more pages and blocks to return
 arrays.

---
 modules/search/search.module    | 2 +-
 modules/search/search.pages.inc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/search')

diff --git a/modules/search/search.module b/modules/search/search.module
index 8c26c6b6f..84854728d 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -175,7 +175,7 @@ function search_block_list() {
  */
 function search_block_view($delta = '') {
   if (user_access('search content')) {
-    $block['content'] = drupal_render(drupal_get_form('search_block_form'));
+    $block['content'] = drupal_get_form('search_block_form');
     $block['subject'] = t('Search');
     return $block;
   }
diff --git a/modules/search/search.pages.inc b/modules/search/search.pages.inc
index a8d7ce8fb..424619e23 100644
--- a/modules/search/search.pages.inc
+++ b/modules/search/search.pages.inc
@@ -40,10 +40,10 @@ function search_view($type = 'node') {
     }
 
     // Construct the search form.
-    $output = drupal_render(drupal_get_form('search_form', NULL, $keys, $type));
-    $output .= $results;
+    $build['search_form'] = drupal_get_form('search_form', NULL, $keys, $type);
+    $build['search_results'] = array('#markup' => $results);
 
-    return $output;
+    return $build;
   }
 
   return drupal_get_form('search_form', NULL, empty($keys) ? '' : $keys, $type);
-- 
cgit v1.2.3