From 74bc2d6715a98cbe119794a9a64f8c8c6768b3a4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gerg=C5=91=20Tisza?= <gtisza@wikimedia.org>
Date: Fri, 25 Nov 2016 04:08:40 +0000
Subject: [PATCH] Always preserve uselang in login form

If $wgLoginLanguageSelector is false, we don't show the language
selector; but there's no reason to ignore a uselang URL parameter.

Change-Id: I66c3c2cf50d4071e82bfe736dfe5480686d763f3
---
 includes/specialpage/LoginSignupSpecialPage.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php
index a95716a8ce..73a1bdd203 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -641,7 +641,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 	 * @return HTMLForm
 	 */
 	protected function getAuthForm( array $requests, $action, $msg = '', $msgType = 'error' ) {
-		global $wgSecureLogin, $wgLoginLanguageSelector;
+		global $wgSecureLogin;
 		// FIXME merge this with parent
 
 		if ( isset( $this->authForm ) ) {
@@ -667,7 +667,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 		$form = HTMLForm::factory( 'vform', $formDescriptor, $context );
 
 		$form->addHiddenField( 'authAction', $this->authAction );
-		if ( $wgLoginLanguageSelector && $this->mLanguage ) {
+		if ( $this->mLanguage ) {
 			$form->addHiddenField( 'uselang', $this->mLanguage );
 		}
 		$form->addHiddenField( 'force', $this->securityLevel );
@@ -702,7 +702,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 	 */
 	protected function getFakeTemplate( $msg, $msgType ) {
 		global $wgAuth, $wgEnableEmail, $wgHiddenPrefs, $wgEmailConfirmToEdit, $wgEnableUserEmail,
-			   $wgSecureLogin, $wgLoginLanguageSelector, $wgPasswordResetRoutes;
+			   $wgSecureLogin, $wgPasswordResetRoutes;
 
 		// make a best effort to get the value of fields which used to be fixed in the old login
 		// template but now might or might not exist depending on what providers are used
@@ -760,7 +760,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 		# Don't show a "create account" link if the user can't.
 		if ( $this->showCreateAccountLink() ) {
 			# Pass any language selection on to the mode switch link
-			if ( $wgLoginLanguageSelector && $this->mLanguage ) {
+			if ( $this->mLanguage ) {
 				$linkq .= '&uselang=' . $this->mLanguage;
 			}
 			// Supply URL, login template creates the button.
@@ -892,7 +892,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 	 * @return array
 	 */
 	protected function getFieldDefinitions( $template ) {
-		global $wgEmailConfirmToEdit, $wgLoginLanguageSelector;
+		global $wgEmailConfirmToEdit;
 
 		$isLoggedIn = $this->getUser()->isLoggedIn();
 		$continuePart = $this->isContinued() ? 'continue-' : '';
@@ -1148,7 +1148,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 				$linkTitle = $this->getTitleFor( $this->isSignup() ? 'Userlogin' :'CreateAccount' );
 				$linkq = $this->getReturnToQueryStringFragment();
 				// Pass any language selection on to the mode switch link
-				if ( $wgLoginLanguageSelector && $this->mLanguage ) {
+				if ( $this->mLanguage ) {
 					$linkq .= '&uselang=' . $this->mLanguage;
 				}
 				$loggedIn = $this->getUser()->isLoggedIn();
-- 
2.20.1