From: John Du Hart <johnduhart@users.mediawiki.org>
Date: Sat, 26 Nov 2011 22:50:05 +0000 (+0000)
Subject: Followup r103984, take the default for the language dropdown from the URL
X-Git-Tag: 1.31.0-rc.0~26280
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=d0cd28ee7a0e8ab0b32b77123f2533c259f3367e;p=lhc%2Fweb%2Fwiklou.git

Followup r103984, take the default for the language dropdown from the URL
---

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 544f18c613..5e694c9db0 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -161,6 +161,7 @@ class WebInstaller_Language extends WebInstallerPage {
 		$userLang = $r->getVal( 'uselang' );
 		$contLang = $r->getVal( 'ContLang' );
 
+		$languages = Language::getLanguageNames();
 		$lifetime = intval( ini_get( 'session.gc_maxlifetime' ) );
 		if ( !$lifetime ) {
 			$lifetime = 1440; // PHP default
@@ -181,7 +182,6 @@ class WebInstaller_Language extends WebInstallerPage {
 				}
 				$this->parent->showError( $msg, $wgLang->formatTimePeriod( $lifetime ) );
 			} else {
-				$languages = Language::getLanguageNames();
 				if ( isset( $languages[$userLang] ) ) {
 					$this->setVar( '_UserLang', $userLang );
 				}