diff --git a/core/modules/language/language.negotiation.inc b/core/modules/language/language.negotiation.inc index 9e145bb..e05505b 100644 --- a/core/modules/language/language.negotiation.inc +++ b/core/modules/language/language.negotiation.inc @@ -189,7 +189,7 @@ function language_from_browser($languages) { */ function language_from_user($languages) { // User preference (only for authenticated users). - global $user; + $user = Drupal::request()->attributes->get('_account'); if ($user->id()) { $langcode = $user->getPreferredLangcode(); @@ -218,7 +218,7 @@ function language_from_user($languages) { */ function language_from_user_admin(array $languages, Request $request = NULL) { // User preference (only for authenticated users). - global $user; + $user = Drupal::request()->attributes->get('_account'); if ($user->id()) { $request_path = $request ? urldecode(trim($request->getPathInfo(), '/')) : _current_path(); @@ -248,7 +248,7 @@ function language_from_session($languages) { // Request parameter: we need to update the session parameter only if we have // an authenticated user. if (isset($_GET[$param]) && isset($languages[$langcode = $_GET[$param]])) { - global $user; + $user = Drupal::request()->attributes->get('_account'); if ($user->id()) { $_SESSION[$param] = $langcode; } @@ -486,7 +486,7 @@ function language_url_rewrite_session(&$path, &$options) { // The following values are not supposed to change during a single page // request processing. if (!isset($query_rewrite)) { - global $user; + $user = Drupal::request()->attributes->get('_account'); if (!$user->id()) { $languages = language_list(); $query_param = check_plain(config('language.negotiation')->get('session.parameter'));