diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-12-14 20:10:45 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-12-14 20:10:45 +0000 |
| commit | 764f1177efe7bafe5ab47b21968d4b0921c3896c (patch) | |
| tree | b0d25865abedeed7d251bef5c43857e79bc6f210 /modules/search.module | |
| parent | e53f58fbe0e6c033fce65bd0d7a76d25911ff158 (diff) | |
| download | brdo-764f1177efe7bafe5ab47b21968d4b0921c3896c.tar.gz brdo-764f1177efe7bafe5ab47b21968d4b0921c3896c.tar.bz2 | |
- Patch #40631 by Chris Johnson: is_array() slower than isset() or empty().
Diffstat (limited to 'modules/search.module')
| -rw-r--r-- | modules/search.module | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/search.module b/modules/search.module index 908509da9..2755b19eb 100644 --- a/modules/search.module +++ b/modules/search.module @@ -975,7 +975,7 @@ function search_form($action = '', $keys = '', $type = null, $prompt = null) { $form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search')); $form_module = module_invoke($type, 'search', 'form', $keys); - if (is_array($form_module)) { + if (isset($form_module) && is_array($form_module)) { $form = array_merge($form, $form_module); } @@ -991,7 +991,7 @@ function search_data($keys = NULL, $type = 'node') { if (isset($keys)) { if (module_hook($type, 'search')) { $results = module_invoke($type, 'search', 'search', $keys); - if (is_array($results) && count($results)) { + if (isset($results) && is_array($results) && count($results)) { $output .= '<dl class="search-results">'; foreach ($results as $entry) { $output .= theme('search_item', $entry, $type); |