installer: Get WebRequest in mw-config via RequestContext
authorDerick Alangi <alangiderick@gmail.com>
Sat, 9 Mar 2019 13:29:03 +0000 (14:29 +0100)
committerKrinkle <krinklemail@gmail.com>
Sat, 9 Mar 2019 15:42:45 +0000 (15:42 +0000)
Change-Id: I535a91d09cc74ab08b782973a946dcf3fc3e6b46

mw-config/index.php

index 804d0a1..899f21e 100644 (file)
@@ -38,9 +38,10 @@ require dirname( __DIR__ ) . '/includes/WebStart.php';
 wfInstallerMain();
 
 function wfInstallerMain() {
-       global $wgRequest, $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames;
+       global $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames;
+       $request = RequestContext::getMain()->getRequest();
 
-       $installer = InstallerOverrides::getWebInstaller( $wgRequest );
+       $installer = InstallerOverrides::getWebInstaller( $request );
 
        if ( !$installer->startSession() ) {
                if ( $installer->request->getVal( "css" ) ) {
@@ -62,8 +63,8 @@ function wfInstallerMain() {
                $session = array();
        }
 
-       if ( !is_null( $wgRequest->getVal( 'uselang' ) ) ) {
-               $langCode = $wgRequest->getVal( 'uselang' );
+       if ( !is_null( $request->getVal( 'uselang' ) ) ) {
+               $langCode = $request->getVal( 'uselang' );
        } elseif ( isset( $session['settings']['_UserLang'] ) ) {
                $langCode = $session['settings']['_UserLang'];
        } else {