diff options
Diffstat (limited to 'modules/locale/locale.admin.inc')
| -rw-r--r-- | modules/locale/locale.admin.inc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc index da4dcc35d..be25a35a0 100644 --- a/modules/locale/locale.admin.inc +++ b/modules/locale/locale.admin.inc @@ -519,7 +519,7 @@ function _locale_languages_configure_form_language_table(&$form, $type) { ); $language_providers = $form['#language_providers']; - $enabled_providers = variable_get("locale_language_providers_enabled_$type", array()); + $enabled_providers = variable_get("language_negotiation_$type", array()); $providers_weight = variable_get("locale_language_providers_weight_$type", array()); // Add missing data to the providers lists. @@ -527,16 +527,13 @@ function _locale_languages_configure_form_language_table(&$form, $type) { if (!isset($providers_weight[$id])) { $providers_weight[$id] = language_provider_weight($provider); } - if (!isset($enabled_providers[$id])) { - $enabled_providers[$id] = FALSE; - } } // Order providers list by weight. asort($providers_weight); foreach ($providers_weight as $id => $weight) { - $enabled = $enabled_providers[$id]; + $enabled = isset($enabled_providers[$id]); $provider = $language_providers[$id]; // List the provider only if the current type is defined in its 'types' key. @@ -665,7 +662,6 @@ function locale_languages_configure_form_submit($form, &$form_state) { } language_negotiation_set($type, $negotiation); - variable_set("locale_language_providers_enabled_$type", $enabled_providers); variable_set("locale_language_providers_weight_$type", $providers_weight); } |