diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/node.module | 5 | ||||
| -rw-r--r-- | modules/node/node.module | 5 | ||||
| -rw-r--r-- | modules/search.module | 2 | ||||
| -rw-r--r-- | modules/search/search.module | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/modules/node.module b/modules/node.module index be974062b..cf8c085a2 100644 --- a/modules/node.module +++ b/modules/node.module @@ -2170,7 +2170,7 @@ function node_form_alter($form_id, &$form) { */ function node_search_validate($form_id, $form_values, $form) { // Initialise using any existing basic search keywords. - $keys = $form['basic']['inline']['processed_keys']['#ref']; + $keys = $form_values['processed_keys']; // Insert extra restrictions into the search keywords string. if (isset($form_values['type']) && is_array($form_values['type'])) { @@ -2180,6 +2180,7 @@ function node_search_validate($form_id, $form_values, $form) { $keys = search_query_insert($keys, 'type', implode(',', array_keys($form_values['type']))); } } + if (isset($form_values['category']) && is_array($form_values['category'])) { $keys = search_query_insert($keys, 'category', implode(',', $form_values['category'])); } @@ -2197,7 +2198,7 @@ function node_search_validate($form_id, $form_values, $form) { $keys .= ' "'. str_replace('"', ' ', $form_values['phrase']) .'"'; } if (!empty($keys)) { - $form['basic']['inline']['processed_keys']['#ref'] = trim($keys); + form_set_value($form['basic']['inline']['processed_keys'], trim($keys)); } } diff --git a/modules/node/node.module b/modules/node/node.module index be974062b..cf8c085a2 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2170,7 +2170,7 @@ function node_form_alter($form_id, &$form) { */ function node_search_validate($form_id, $form_values, $form) { // Initialise using any existing basic search keywords. - $keys = $form['basic']['inline']['processed_keys']['#ref']; + $keys = $form_values['processed_keys']; // Insert extra restrictions into the search keywords string. if (isset($form_values['type']) && is_array($form_values['type'])) { @@ -2180,6 +2180,7 @@ function node_search_validate($form_id, $form_values, $form) { $keys = search_query_insert($keys, 'type', implode(',', array_keys($form_values['type']))); } } + if (isset($form_values['category']) && is_array($form_values['category'])) { $keys = search_query_insert($keys, 'category', implode(',', $form_values['category'])); } @@ -2197,7 +2198,7 @@ function node_search_validate($form_id, $form_values, $form) { $keys .= ' "'. str_replace('"', ' ', $form_values['phrase']) .'"'; } if (!empty($keys)) { - $form['basic']['inline']['processed_keys']['#ref'] = trim($keys); + form_set_value($form['basic']['inline']['processed_keys'], trim($keys)); } } diff --git a/modules/search.module b/modules/search.module index 4cc487e41..cf4cbc4e9 100644 --- a/modules/search.module +++ b/modules/search.module @@ -1006,7 +1006,7 @@ function search_form($action = '', $keys = '', $type = NULL, $prompt = NULL) { * search form. */ function search_form_validate($form_id, $form_values, $form) { - $form['basic']['inline']['processed_keys']['#ref'] = trim($form_values['keys']); + form_set_value($form['basic']['inline']['processed_keys'], trim($form_values['keys'])); } /** diff --git a/modules/search/search.module b/modules/search/search.module index 4cc487e41..cf4cbc4e9 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -1006,7 +1006,7 @@ function search_form($action = '', $keys = '', $type = NULL, $prompt = NULL) { * search form. */ function search_form_validate($form_id, $form_values, $form) { - $form['basic']['inline']['processed_keys']['#ref'] = trim($form_values['keys']); + form_set_value($form['basic']['inline']['processed_keys'], trim($form_values['keys'])); } /** |