Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / user / src / Plugin / LanguageNegotiation / LanguageNegotiationUser.php

diff --git a/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php b/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php
index da8aaf000e89dee7cca8a2e68e99b3d1a4ea1a05..0e8108a9c8d3ee54efc02a9939aa3bed4a3afc50 100644 (file)
--- 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;
       }
     }