From d0cd28ee7a0e8ab0b32b77123f2533c259f3367e Mon Sep 17 00:00:00 2001 From: John Du Hart Date: Sat, 26 Nov 2011 22:50:05 +0000 Subject: [PATCH] Followup r103984, take the default for the language dropdown from the URL --- includes/installer/WebInstallerPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ); } -- 2.20.1