From: John Du Hart <johnduhart@users.mediawiki.org>
Date: Mon, 21 Nov 2011 15:30:20 +0000 (+0000)
Subject: Bug 28296 - Installer should honor &uselang= parameter
X-Git-Tag: 1.31.0-rc.0~26371
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=2ee37f2267143af188effd9e7dc10b9f6718640a;p=lhc%2Fweb%2Fwiklou.git

Bug 28296 - Installer should honor &uselang= parameter
---

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 7427906e04..21d23400b5 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -12,7 +12,8 @@
  * @ingroup Deployment
  * @since 1.17
  */
-class WebInstaller extends Installer {
+class
+WebInstaller extends Installer {
 
 	/**
 	 * @var WebInstallerOutput
@@ -472,7 +473,6 @@ class WebInstaller extends Installer {
 			$this->setVar( '_UserLang', $wgLanguageCode );
 		} else {
 			$wgLanguageCode = $this->getVar( 'wgLanguageCode' );
-			$wgLang = Language::factory( $this->getVar( '_UserLang' ) );
 			$wgContLang = Language::factory( $wgLanguageCode );
 		}
 	}
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 5b483c05d2..80c939b590 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -158,7 +158,7 @@ class WebInstaller_Language extends WebInstallerPage {
 	public function execute() {
 		global $wgLang;
 		$r = $this->parent->request;
-		$userLang = $r->getVal( 'UserLang' );
+		$userLang = $r->getVal( 'userlang' );
 		$contLang = $r->getVal( 'ContLang' );
 
 		$lifetime = intval( ini_get( 'session.gc_maxlifetime' ) );
@@ -207,7 +207,7 @@ class WebInstaller_Language extends WebInstallerPage {
 		}
 		$this->startForm();
 		$s = Html::hidden( 'LanguageRequestTime', time() ) .
-			$this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang,
+			$this->getLanguageSelector( 'userlang', 'config-your-language', $userLang,
 				$this->parent->getHelpBox( 'config-your-language-help' ) ) .
 			$this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang,
 				$this->parent->getHelpBox( 'config-wiki-language-help' ) );
diff --git a/mw-config/index.php b/mw-config/index.php
index 1e6d0e4f3f..c65be69c0c 100644
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -34,10 +34,10 @@ function wfInstallerMain() {
 		$session = array();
 	}
 
-	if ( isset( $session['settings']['_UserLang'] ) ) {
+	if ( !is_null( $wgRequest->getVal( 'uselang' ) ) ) {
+		$langCode = $wgRequest->getVal( 'uselang' );
+	} elseif ( isset( $session['settings']['_UserLang'] ) ) {
 		$langCode = $session['settings']['_UserLang'];
-	} elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) {
-		$langCode = $wgRequest->getVal( 'UserLang' );
 	} else {
 		$langCode = 'en';
 	}