From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sun, 27 Apr 2008 12:59:15 +0000 (+0000)
Subject: * Respect uselang
X-Git-Tag: 1.31.0-rc.0~48050
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=892dbafdc32d71f15bca8dc38a68124d67e3cf75;p=lhc%2Fweb%2Fwiklou.git

* Respect uselang
---

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 76d699beca..1fc3dd1a82 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -463,8 +463,9 @@ class LoginForm {
 					/* Replace the language object to provide user interface in correct
 					 * language immediately on this first page load.
 					 */
-					global $wgLang;
-					$wgLang = Language::factory( $wgUser->getOption( 'language' ) );
+					global $wgLang, $wgRequest;
+					$code = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
+					$wgLang = Language::factory( $code );
 					return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
 				} else {
 					return $this->cookieRedirectCheck( 'login' );