diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-05-15 05:43:16 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-05-15 05:43:16 +0000 |
| commit | 75897e80001fdfc0b63b99c012ab8a87a799a56d (patch) | |
| tree | d59f2c802b47ee7212b5b519ea0a854dd3a8efe2 | |
| parent | 8ba14fa492cc4b56f48b810eccbd54c3562bc3f2 (diff) | |
| download | brdo-75897e80001fdfc0b63b99c012ab8a87a799a56d.tar.gz brdo-75897e80001fdfc0b63b99c012ab8a87a799a56d.tar.bz2 | |
- Patch #138706 by Eaton: 2 form API fixes.
| -rw-r--r-- | modules/node/node.module | 5 | ||||
| -rw-r--r-- | modules/search/search.module | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/node/node.module b/modules/node/node.module index c70f3aa0b..8113c6cdd 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2351,12 +2351,13 @@ function node_delete_confirm($node) { /** * Execute node deletion */ -function node_delete_confirm_submit($form_id, $form_values) { +function node_delete_confirm_submit($form_values, $form, &$form_state) { if ($form_values['confirm']) { node_delete($form_values['nid']); } - return '<front>'; + $form_state['redirect'] = '<front>'; + return; } /** diff --git a/modules/search/search.module b/modules/search/search.module index ebe2ac7f1..af9d0e80f 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -1045,7 +1045,7 @@ function search_form($action = '', $keys = '', $type = NULL, $prompt = NULL) { * value for the basic search form. */ function search_form_validate($form_values, $form, &$form_state) { - form_set_value($form['basic']['inline']['processed_keys'], trim($form_values['keys'], $form_state)); + form_set_value($form['basic']['inline']['processed_keys'], trim($form_values['keys']), $form_state); } /** @@ -1089,6 +1089,7 @@ function search_box($form_id) { * Process a block search form submission. */ function search_box_form_submit($form_values, $form, &$form_state) { + $form_id = $form['form_id']['#value']; $form_state['redirect'] = 'search/node/'. trim($form_values[$form_id .'_keys']); return; } |