From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 mw-config/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mw-config')

diff --git a/mw-config/index.php b/mw-config/index.php
index 1e6d0e4f..c65be69c 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';
 	}
-- 
cgit v1.2.2