diff -u b/core/modules/language/language.install b/core/modules/language/language.install --- b/core/modules/language/language.install +++ b/core/modules/language/language.install @@ -48,7 +48,7 @@ variable_del("language_negotiation_methods_weight_$type"); } - config('language.negotiation')->delete('session.parameter')->save(); + config('language.negotiation')->delete('session.parameter'); // Re-initialize the language system so successive calls to t() and other // functions will not expect languages to be present. @@ -106,9 +105,0 @@ - -/** - * Moves language settings from variables to config. - */ -function language_update_8000() { - update_variables_to_config('language.negotiation', array( - 'language_negotiation_session_param' => 'session.parameter', - )); -} diff -u b/core/modules/language/language.negotiation.inc b/core/modules/language/language.negotiation.inc --- b/core/modules/language/language.negotiation.inc +++ b/core/modules/language/language.negotiation.inc @@ -320,7 +320,7 @@ * Return the session language switcher block. */ function language_switcher_session($type, $path) { - $param = config('language.negotiation')->get('session.parameter'); + $param = variable_get('language_negotiation_session_param', 'language'); $language_query = isset($_SESSION[$param]) ? $_SESSION[$param] : drupal_container()->get($type)->langcode; $languages = language_list(); @@ -334,7 +334,7 @@ * Return the session language switcher block. */ function language_switcher_session($type, $path) { - $param = variable_get('language_negotiation_session_param', 'language'); + $param = config('language.negotiation')->get('session.parameter'); $language_query = isset($_SESSION[$param]) ? $_SESSION[$param] : language_manager($type)->langcode; $languages = language_list(); @@ -453,7 +453,7 @@ global $user; if (!$user->uid) { $languages = language_list(); - $query_param = check_plain(config('language.negotiation')->get('session.parameter')); + $query_param = check_plain(variable_get('language_negotiation_session_param', 'language')); $query_value = isset($_GET[$query_param]) ? check_plain($_GET[$query_param]) : NULL; $query_rewrite = isset($languages[$query_value]) && language_negotiation_method_enabled(LANGUAGE_NEGOTIATION_SESSION); } @@ -467,7 +467,7 @@ global $user; if (!$user->uid) { $languages = language_list(); - $query_param = check_plain(variable_get('language_negotiation_session_param', 'language')); + $query_param = check_plain(config('language.negotiation')->get('session.parameter')); $query_value = isset($_GET[$query_param]) ? check_plain($_GET[$query_param]) : NULL; $query_rewrite = isset($languages[$query_value]) && language_negotiation_method_enabled(LANGUAGE_NEGOTIATION_SESSION); } diff -u b/core/modules/locale/locale.install b/core/modules/locale/locale.install --- b/core/modules/locale/locale.install +++ b/core/modules/locale/locale.install @@ -568,10 +568,6 @@ variable_del($deprecated_variable_name); } } - - update_variables_to_config('language.negotiation', array( - 'locale_language_negotiation_session_param' => 'session.parameter', - )); } /**