X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fcontext%2FRequestContext.php;h=2cbe67c5250d1beb35af0733382d6152a839e03f;hb=dabbf42aa702ef1095bd3ecff03447360f4e0aea;hp=7563330697ee9b4d04a18a699c1db4506b480907;hpb=2dd32981a8326a6207ac866b39410f1b86179288;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index 7563330697..2cbe67c525 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -257,6 +257,8 @@ class RequestContext implements IContextSource, MutableContext {
 	 */
 	public function setUser( User $user ) {
 		$this->user = $user;
+		// Invalidate cached user interface language
+		$this->lang = null;
 	}
 
 	/**
@@ -325,8 +327,6 @@ class RequestContext implements IContextSource, MutableContext {
 		} elseif ( $this->lang === null ) {
 			$this->recursion = true;
 
-			global $wgContLang;
-
 			try {
 				$request = $this->getRequest();
 				$user = $this->getUser();
@@ -340,7 +340,7 @@ class RequestContext implements IContextSource, MutableContext {
 				Hooks::run( 'UserGetLanguageObject', [ $user, &$code, $this ] );
 
 				if ( $code === $this->getConfig()->get( 'LanguageCode' ) ) {
-					$this->lang = $wgContLang;
+					$this->lang = MediaWikiServices::getInstance()->getContentLanguage();
 				} else {
 					$obj = Language::factory( $code );
 					$this->lang = $obj;