From 41822a6b9ea7339112207ca7c02b196668a610e6 Mon Sep 17 00:00:00 2001 From: Derick Alangi Date: Sat, 9 Mar 2019 14:29:03 +0100 Subject: [PATCH] installer: Get WebRequest in mw-config via RequestContext Change-Id: I535a91d09cc74ab08b782973a946dcf3fc3e6b46 --- mw-config/index.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mw-config/index.php b/mw-config/index.php index 804d0a1159..899f21ef66 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -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 { -- 2.20.1