From: John Du Hart <johnduhart@users.mediawiki.org>
Date: Wed, 23 Nov 2011 00:03:42 +0000 (+0000)
Subject: Followup r103814, fixed a few typos and a stray newline
X-Git-Tag: 1.31.0-rc.0~26341
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=39fb9897130b444c239de97b203d9ff97b7271f5;p=lhc%2Fweb%2Fwiklou.git

Followup r103814, fixed a few typos and a stray newline
---

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index c708a0d9f0..bf2c18ccb2 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -12,8 +12,7 @@
  * @ingroup Deployment
  * @since 1.17
  */
-class
-WebInstaller extends Installer {
+class WebInstaller extends Installer {
 
 	/**
 	 * @var WebInstallerOutput
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 80c939b590..544f18c613 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( 'uselang' );
 		$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( 'uselang', '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' ) );