Merge "Make OutputPage's mechanism for gathering Vary headers reusable"

[lhc/web/wiklou.git] / mw-config / index.php

diff --git a/mw-config/index.php b/mw-config/index.php
index 1e6d0e4..3f993f0 100644 (file)
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -10,7 +10,7 @@ define( 'MEDIAWIKI_INSTALL', true );
 
 chdir( dirname( dirname( __FILE__ ) ) );
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
-       require ( 'phase3/includes/WebStart.php' );
+       require ( 'core/includes/WebStart.php' );
 } else {
        require( dirname( dirname( __FILE__ ) ) . '/includes/WebStart.php' );
 }
@@ -20,7 +20,7 @@ wfInstallerMain();
 function wfInstallerMain() {
        global $wgRequest, $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames;
 
-       $installer = new WebInstaller( $wgRequest );
+       $installer = InstallerOverrides::getWebInstaller( $wgRequest );
 
        if ( !$installer->startSession() ) {
                $installer->finish();
@@ -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';
        }