Merge "specialpage: Fix login crash caused by unknown language via ?uselang"

diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index 16c304c..2cbe67c 100644 (file)
--- 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;
        }
 
        /**

diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php
index 48dd405..743a5a5 100644 (file)
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -491,10 +491,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
                $wgUser = $user;
                $context->setUser( $user );
 
-               $code = $this->getRequest()->getVal( 'uselang', $user->getOption( 'language' ) );
-               $userLang = Language::factory( $code );
-               $wgLang = $userLang;
-               $context->setLanguage( $userLang );
+               $wgLang = $context->getLanguage();
        }
 
        /**