diff options
Diffstat (limited to 'modules/system/system.module')
| -rw-r--r-- | modules/system/system.module | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index b94bc9742..53b496d30 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -442,7 +442,7 @@ function system_admin_theme_settings() { } -function system_admin_theme_submit($form_values, $form, &$form_state) { +function system_admin_theme_submit($form, &$form_state, $form_values) { // If we're changing themes, make sure the theme has its blocks initialized. if ($form_values['admin_theme'] != variable_get('admin_theme', '0')) { $result = db_query("SELECT status FROM {blocks} WHERE theme = '%s'", $form_values['admin_theme']); @@ -943,7 +943,7 @@ if (Drupal.jsEnabled) { return $form; } -function system_date_time_settings_submit($form_values, $form, &$form_state) { +function system_date_time_settings_submit($form, &$form_state, $form_values) { if ($form_values['date_format_short'] == 'custom') { $form_values['date_format_short'] = $form_values['date_format_short_custom']; } @@ -1238,7 +1238,7 @@ function system_settings_form($form) { return $form; } -function system_theme_settings_submit($form_values, $form, &$form_state) { +function system_theme_settings_submit($form, &$form_state, $form_values) { $op = isset($_POST['op']) ? $_POST['op'] : ''; $key = $form_values['var']; @@ -1264,7 +1264,7 @@ function system_theme_settings_submit($form_values, $form, &$form_state) { * add an array_filter value to your form. * */ -function system_settings_form_submit($form_values, $form, &$form_state) { +function system_settings_form_submit($form, &$form_state, $form_values) { $op = isset($form_values['op']) ? $form_values['op'] : ''; // Exclude unnecessary elements. @@ -1369,7 +1369,7 @@ function theme_system_themes_form($form) { } -function system_themes_form_submit($form_values, $form, &$form_state) { +function system_themes_form_submit($form, &$form_state, $form_values) { // Store list of previously enabled themes and disable all themes $old_theme_list = $new_theme_list = array(); @@ -1645,7 +1645,7 @@ function system_module_build_dependencies($modules, $form_values) { /** * Submit callback; handles modules form submission. */ -function system_modules_submit($form_values, $form, &$form_state) { +function system_modules_submit($form, &$form_state, $form_values) { include_once './includes/install.inc'; $new_modules = array(); @@ -1946,7 +1946,7 @@ function theme_system_modules_uninstall($form) { * @param * $form_values Submitted form values. */ -function system_modules_uninstall_validate($form_values, $form, &$form_state) { +function system_modules_uninstall_validate($form, &$form_state, $form_values) { // Form submitted, but no modules selected. if (!count(array_filter($form_values['uninstall']))) { drupal_set_message(t('No modules selected.'), 'error'); @@ -1962,7 +1962,7 @@ function system_modules_uninstall_validate($form_values, $form, &$form_state) { * @param * $form_values Submitted form values. */ -function system_modules_uninstall_submit($form_values, $form, &$form_state) { +function system_modules_uninstall_submit($form, &$form_state, $form_values) { // Make sure the install API is available. include_once './includes/install.inc'; |