diff core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

--- a/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php	Thu Feb 28 13:21:36 2019 +0000
@@ -30,10 +30,9 @@
 
     // User preference (only for authenticated users).
     if ($this->languageManager && $this->currentUser->isAuthenticated()) {
-      $preferred_langcode = $this->currentUser->getPreferredLangcode();
-      $default_langcode = $this->languageManager->getDefaultLanguage()->getId();
+      $preferred_langcode = $this->currentUser->getPreferredLangcode(FALSE);
       $languages = $this->languageManager->getLanguages();
-      if (!empty($preferred_langcode) && $preferred_langcode != $default_langcode && isset($languages[$preferred_langcode])) {
+      if (!empty($preferred_langcode) && isset($languages[$preferred_langcode])) {
         $langcode = $preferred_langcode;
       }
     }