From 23889c35e90af64cb09054333d6a2b089b2786be Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 7 Nov 2016 10:55:00 -0500 Subject: [PATCH] LoginSignupSpecialPage: Don't output empty 'uselang' It confuses things because the empty string is accepted as a language, which falls back to English. Bug: T146147 Change-Id: Ie56eb95a85a24c5701901abdfb722cebc108bde4 --- includes/specialpage/LoginSignupSpecialPage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index 984e32bdb1..7cdcdeacb4 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -156,7 +156,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { [ 'returnto' => $this->mReturnTo, 'returntoquery' => $this->mReturnToQuery, - 'uselang' => $this->mLanguage, + 'uselang' => $this->mLanguage ?: null, 'fromhttp' => $wgSecureLogin && $this->mFromHTTP ? '1' : null, ] ); @@ -619,7 +619,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { $form = HTMLForm::factory( 'vform', $formDescriptor, $context ); $form->addHiddenField( 'authAction', $this->authAction ); - if ( $wgLoginLanguageSelector ) { + if ( $wgLoginLanguageSelector && $this->mLanguage ) { $form->addHiddenField( 'uselang', $this->mLanguage ); } $form->addHiddenField( 'force', $this->securityLevel ); -- 2.20.1