summaryrefslogtreecommitdiff
path: root/modules/search
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-06-29 23:16:35 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2011-06-29 23:16:35 -0700
commit2c01d0549e7908cfd9fd94cd1343b6124610e6fe (patch)
tree2350e1b07e0c96e92f5e3b60c28500f35fec0b9d /modules/search
parent2608c670ababfd04a4ce85393db7ebe4a0c14188 (diff)
downloadbrdo-2c01d0549e7908cfd9fd94cd1343b6124610e6fe.tar.gz
brdo-2c01d0549e7908cfd9fd94cd1343b6124610e6fe.tar.bz2
Issue #1049462 by rfay: Fixed Usage of deprecated form_state['clicked_button'] causes bugs during AJAX submissions by non-buttons.
Diffstat (limited to 'modules/search')
-rw-r--r--modules/search/search.admin.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/search/search.admin.inc b/modules/search/search.admin.inc
index afa02defb..d93c85288 100644
--- a/modules/search/search.admin.inc
+++ b/modules/search/search.admin.inc
@@ -143,7 +143,7 @@ function search_admin_settings($form) {
*/
function search_admin_settings_validate($form, &$form_state) {
// Check whether we selected a valid default.
- if ($form_state['clicked_button']['#value'] != t('Reset to defaults')) {
+ if ($form_state['triggering_element']['#value'] != t('Reset to defaults')) {
$new_modules = array_filter($form_state['values']['search_active_modules']);
$default = $form_state['values']['search_default_module'];
if (!in_array($default, $new_modules, TRUE)) {
@@ -164,7 +164,7 @@ function search_admin_settings_submit($form, &$form_state) {
}
$current_modules = variable_get('search_active_modules', array('node', 'user'));
// Check whether we are resetting the values.
- if ($form_state['clicked_button']['#value'] == t('Reset to defaults')) {
+ if ($form_state['triggering_element']['#value'] == t('Reset to defaults')) {
$new_modules = array('node', 'user');
}
else {