Revert r75588 and r77381. Block just the tainted pairs of username/passwords until...

[lhc/web/wiklou.git] / index.php

diff --git a/index.php b/index.php
index 7469866..84eeaaa 100644 (file)
--- a/index.php
+++ b/index.php
@@ -50,15 +50,13 @@ if( !is_null( $maxLag ) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
        exit;
 }
 
-# Query string fields
-$action = $wgRequest->getVal( 'action', 'view' );
-$title = $wgRequest->getVal( 'title' );
-
 # Set title from request parameters
-$wgTitle = $mediaWiki->checkInitialQueries( $title, $action );
+$wgTitle = $mediaWiki->checkInitialQueries( $wgRequest );
 
 wfProfileOut( 'main-misc-setup' );
 
+$action = $wgRequest->getVal( 'action' );
+
 # Send Ajax requests to the Ajax dispatcher.
 if( $wgUseAjax && $action == 'ajax' ) {
        $dispatcher = new AjaxDispatcher();
@@ -82,7 +80,10 @@ if( $wgUseFileCache && $wgTitle !== null ) {
                        # Do any stats increment/watchlist stuff
                        $wgArticle = MediaWiki::articleFromTitle( $wgTitle );
                        $wgArticle->viewUpdates();
+                       # Tell $wgOut that output is taken care of
+                       $wgOut->disable();
                        wfProfileOut( 'main-try-filecache' );
+                       $mediaWiki->finalCleanup( $wgOut );
                        $mediaWiki->restInPeace();
                        exit;
                }
@@ -91,12 +92,9 @@ if( $wgUseFileCache && $wgTitle !== null ) {
 }
 
 # Setting global variables in mediaWiki
-$mediaWiki->setVal( 'action', $action );
-$mediaWiki->setVal( 'DisabledActions', $wgDisabledActions );
 $mediaWiki->setVal( 'DisableHardRedirects', $wgDisableHardRedirects );
 $mediaWiki->setVal( 'EnableCreativeCommonsRdf', $wgEnableCreativeCommonsRdf );
 $mediaWiki->setVal( 'EnableDublinCoreRdf', $wgEnableDublinCoreRdf );
-$mediaWiki->setVal( 'JobRunRate', $wgJobRunRate );
 $mediaWiki->setVal( 'Server', $wgServer );
 $mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
 $mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
@@ -104,5 +102,4 @@ $mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
 
 $mediaWiki->performRequestForTitle( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
 $mediaWiki->finalCleanup( $wgOut );
-
 $mediaWiki->restInPeace();