diff --git a/core/lib/Drupal/Core/Session/UserSession.php b/core/lib/Drupal/Core/Session/UserSession.php index 3f8d6a3..aa8d708 100644 --- a/core/lib/Drupal/Core/Session/UserSession.php +++ b/core/lib/Drupal/Core/Session/UserSession.php @@ -102,25 +102,15 @@ class UserSession implements AccountInterface { protected $hostname = ''; /** - * The language manager. - * - * @var \Drupal\Core\Language\LanguageManagerInterface - */ - protected $languageManager; - - /** * Constructs a new user session. * * @param array $values * Array of initial values for the user session. - * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager - * The language manager. */ - public function __construct(array $values = array(), LanguageManagerInterface $language_manager) { + public function __construct(array $values = array()) { foreach ($values as $key => $value) { $this->$key = $value; } - $this->languageManager = $language_manager; } /** @@ -194,7 +184,8 @@ public function isAnonymous() { * {@inheritdoc} */ function getPreferredLangcode($fallback_to_default = TRUE) { - $language_list = $this->languageManager->getLanguages(); + $language_manager = \Drupal::languageManager(); + $language_list = $language_manager->getLanguages(); if (!empty($this->preferred_langcode) && isset($language_list[$this->preferred_langcode])) { return $language_list[$this->preferred_langcode]->getId(); } @@ -207,7 +198,8 @@ function getPreferredLangcode($fallback_to_default = TRUE) { * {@inheritdoc} */ function getPreferredAdminLangcode($fallback_to_default = TRUE) { - $language_list = \Drupal::languageManager()->getLanguages(); + $language_manager = \Drupal::languageManager(); + $language_list = $language_manager->getLanguages(); if (!empty($this->preferred_admin_langcode) && isset($language_list[$this->preferred_admin_langcode])) { return $language_list[$this->preferred_admin_langcode]->getId(); }