diff options
Diffstat (limited to 'modules/search')
| -rw-r--r-- | modules/search/search.module | 11 | ||||
| -rw-r--r-- | modules/search/search.pages.inc | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/modules/search/search.module b/modules/search/search.module index 36a0c1820..c82e85d1a 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -901,19 +901,18 @@ function search_form($form, &$form_state, $action = '', $keys = '', $type = NULL $form['#action'] = $action; $form['#attributes']['class'][] = 'search-form'; $form['module'] = array('#type' => 'value', '#value' => $type); - $form['basic'] = array('#type' => 'item', '#title' => $prompt, '#id' => 'edit-keys'); - $form['basic']['inline'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>'); - $form['basic']['inline']['keys'] = array( + $form['basic'] = array('#type' => 'container', '#attributes' => array('class' => array('container-inline'))); + $form['basic']['keys'] = array( '#type' => 'textfield', - '#title' => '', + '#title' => $prompt, '#default_value' => $keys, '#size' => $prompt ? 40 : 20, '#maxlength' => 255, ); // processed_keys is used to coordinate keyword passing between other forms // that hook into the basic search form. - $form['basic']['inline']['processed_keys'] = array('#type' => 'value', '#value' => array()); - $form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search')); + $form['basic']['processed_keys'] = array('#type' => 'value', '#value' => array()); + $form['basic']['submit'] = array('#type' => 'submit', '#value' => t('Search')); return $form; } diff --git a/modules/search/search.pages.inc b/modules/search/search.pages.inc index 7c1c95048..355fcdc5d 100644 --- a/modules/search/search.pages.inc +++ b/modules/search/search.pages.inc @@ -122,7 +122,7 @@ function template_preprocess_search_result(&$variables) { * value for the basic search form. */ function search_form_validate($form, &$form_state) { - form_set_value($form['basic']['inline']['processed_keys'], trim($form_state['values']['keys']), $form_state); + form_set_value($form['basic']['processed_keys'], trim($form_state['values']['keys']), $form_state); } /** |