Followup r103814, fixed a few typos and a stray newline

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index c708a0d..bf2c18c 100644 (file)
--- 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 80c939b..544f18c 100644 (file)
--- 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' ) );