X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fuser%2Fsrc%2FPlugin%2FLanguageNegotiation%2FLanguageNegotiationUser.php;fp=web%2Fcore%2Fmodules%2Fuser%2Fsrc%2FPlugin%2FLanguageNegotiation%2FLanguageNegotiationUser.php;h=0e8108a9c8d3ee54efc02a9939aa3bed4a3afc50;hp=da8aaf000e89dee7cca8a2e68e99b3d1a4ea1a05;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php b/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php
index da8aaf000..0e8108a9c 100644
--- a/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php
+++ b/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php
@@ -30,10 +30,9 @@ class LanguageNegotiationUser extends LanguageNegotiationMethodBase {
 
     // 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;
       }
     }