Bump and prep 1.34.0

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

diff --git a/mw-config/index.php b/mw-config/index.php
index 804d0a1..b625c96 100644 (file)
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -38,12 +38,13 @@ 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" ) ) {
+               if ( $installer->request->getVal( 'css' ) ) {
                        // Do not display errors on css pages
                        $installer->outputCss();
                        exit;
@@ -62,8 +63,8 @@ function wfInstallerMain() {
                $session = array();
        }
 
-       if ( !is_null( $wgRequest->getVal( 'uselang' ) ) ) {
-               $langCode = $wgRequest->getVal( 'uselang' );
+       if ( $request->getCheck( 'uselang' ) ) {
+               $langCode = $request->getVal( 'uselang' );
        } elseif ( isset( $session['settings']['_UserLang'] ) ) {
                $langCode = $session['settings']['_UserLang'];
        } else {