summaryrefslogtreecommitdiff
path: root/modules/search
diff options
context:
space:
mode:
Diffstat (limited to 'modules/search')
-rw-r--r--modules/search/search.module2
-rw-r--r--modules/search/search.pages.inc6
2 files changed, 4 insertions, 4 deletions
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);