X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fauth%2FAuthManager.php;h=ab7ba0fb8c9e1be6e18b664f1cdffb4ad1245391;hb=d1592cdf05dd20fa0739301abbd78eb8eb1503f0;hp=d3fd5fcb0fd2570621f5b781f3b8835dc26341f7;hpb=3e83cc276aa498fbf5786a1f9bdd6285fa03cdc9;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php index d3fd5fcb0f..ab7ba0fb8c 100644 --- a/includes/auth/AuthManager.php +++ b/includes/auth/AuthManager.php @@ -2408,15 +2408,15 @@ class AuthManager implements LoggerAwareInterface { * @param bool $useContextLang Use 'uselang' to set the user's language */ private function setDefaultUserOptions( User $user, $useContextLang ) { - global $wgContLang; - $user->setToken(); - $lang = $useContextLang ? \RequestContext::getMain()->getLanguage() : $wgContLang; + $contLang = MediaWikiServices::getInstance()->getContentLanguage(); + + $lang = $useContextLang ? \RequestContext::getMain()->getLanguage() : $contLang; $user->setOption( 'language', $lang->getPreferredVariant() ); - if ( $wgContLang->hasVariants() ) { - $user->setOption( 'variant', $wgContLang->getPreferredVariant() ); + if ( $contLang->hasVariants() ) { + $user->setOption( 'variant', $contLang->getPreferredVariant() ); } }