diff options
Diffstat (limited to 'modules/system/system.module')
| -rw-r--r-- | modules/system/system.module | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index e05e27e5d..ccfce5370 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2033,7 +2033,6 @@ function _system_settings_form_automatic_defaults($form) { */ function system_settings_form($form, $automatic_defaults = TRUE) { $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') ); - $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') ); if ($automatic_defaults) { $form = _system_settings_form_automatic_defaults($form); @@ -2060,23 +2059,14 @@ function system_settings_form_submit($form, &$form_state) { unset($form_state['values']['submit'], $form_state['values']['reset'], $form_state['values']['form_id'], $form_state['values']['op'], $form_state['values']['form_token'], $form_state['values']['form_build_id']); foreach ($form_state['values'] as $key => $value) { - if ($op == t('Reset to defaults')) { - variable_del($key); + if (is_array($value) && isset($form_state['values']['array_filter'])) { + $value = array_keys(array_filter($value)); } - else { - if (is_array($value) && isset($form_state['values']['array_filter'])) { - $value = array_keys(array_filter($value)); - } - variable_set($key, $value); - } - } - if ($op == t('Reset to defaults')) { - drupal_set_message(t('The configuration options have been reset to their default values.')); - } - else { - drupal_set_message(t('The configuration options have been saved.')); + variable_set($key, $value); } + drupal_set_message(t('The configuration options have been saved.')); + cache_clear_all(); drupal_theme_rebuild(); } |