diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-05-25 10:43:54 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-05-25 10:43:54 +0000 |
| commit | 76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6 (patch) | |
| tree | 1014be2886f06d9c43ee127d1de2fb0e82f6d5e5 /modules/search | |
| parent | 12024dbca416e8071dc34fb941e4970c150b0f47 (diff) | |
| download | brdo-76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6.tar.gz brdo-76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6.tar.bz2 | |
- Patch #470594 by Moshe: convert more pages and blocks to return arrays.
Diffstat (limited to 'modules/search')
| -rw-r--r-- | modules/search/search.module | 2 | ||||
| -rw-r--r-- | modules/search/search.pages.inc | 6 |
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); |