diff --git a/modules/node.module b/modules/node.module index 092523f1b30a5cb4a8af0eb2a9e321e646b6f775..32083046cf722cc6e4b8a1889bd92bcf2d080520 100644 --- a/modules/node.module +++ b/modules/node.module @@ -2164,9 +2164,9 @@ function node_form_alter($form_id, &$form) { /** * Form API callback for the search form. Registered in node_form_alter(). */ -function node_search_validate($form_id, $form_values) { +function node_search_validate($form_id, $form_values, $form) { // Initialise using any existing basic search keywords. - $keys = $form_values['processed_keys']['#ref']; + $keys = $form['basic']['inline']['processed_keys']['#ref']; // Insert extra restrictions into the search keywords string. if (isset($form_values['type']) && is_array($form_values['type'])) { @@ -2193,7 +2193,7 @@ function node_search_validate($form_id, $form_values) { $keys .= ' "'. str_replace('"', ' ', $form_values['phrase']) .'"'; } if (!empty($keys)) { - $form_values['processed_keys']['#ref'] = trim($keys); + $form['basic']['inline']['processed_keys']['#ref'] = trim($keys); } } diff --git a/modules/node/node.module b/modules/node/node.module index 092523f1b30a5cb4a8af0eb2a9e321e646b6f775..32083046cf722cc6e4b8a1889bd92bcf2d080520 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2164,9 +2164,9 @@ function node_form_alter($form_id, &$form) { /** * Form API callback for the search form. Registered in node_form_alter(). */ -function node_search_validate($form_id, $form_values) { +function node_search_validate($form_id, $form_values, $form) { // Initialise using any existing basic search keywords. - $keys = $form_values['processed_keys']['#ref']; + $keys = $form['basic']['inline']['processed_keys']['#ref']; // Insert extra restrictions into the search keywords string. if (isset($form_values['type']) && is_array($form_values['type'])) { @@ -2193,7 +2193,7 @@ function node_search_validate($form_id, $form_values) { $keys .= ' "'. str_replace('"', ' ', $form_values['phrase']) .'"'; } if (!empty($keys)) { - $form_values['processed_keys']['#ref'] = trim($keys); + $form['basic']['inline']['processed_keys']['#ref'] = trim($keys); } }