* Reorganised the includes directory, creating subdirectories db, parser and specials

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

diff --git a/index.php b/index.php
index 4ff111b..4bbf98f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -47,7 +47,7 @@ OutputPage::setEncodings(); # Not really used yet
 
 $maxLag = $wgRequest->getVal( 'maxlag' );
 if ( !is_null( $maxLag ) ) {
-       if ( !$mediaWiki->checkMaxLag( $wgLoadBalancer, $maxLag ) ) {
+       if ( !$mediaWiki->checkMaxLag( $maxLag ) ) {
                exit;
        }
 }
@@ -56,11 +56,13 @@ if ( !is_null( $maxLag ) ) {
 $action = $wgRequest->getVal( 'action', 'view' );
 $title = $wgRequest->getVal( 'title' );
 
-$wgTitle = $mediaWiki->checkInitialQueries( $title, $action, $wgOut, $wgRequest, $wgContLang );
+$wgTitle = $mediaWiki->checkInitialQueries( $title, $action );
 if ($wgTitle == NULL) {
        unset( $wgTitle );
 }
 
+wfProfileOut( 'main-misc-setup' );
+
 #
 # Send Ajax requests to the Ajax dispatcher.
 #
@@ -69,12 +71,10 @@ if ( $wgUseAjax && $action == 'ajax' ) {
 
        $dispatcher = new AjaxDispatcher();
        $dispatcher->performAction();
-       $mediaWiki->restInPeace( $wgLoadBalancer );
+       $mediaWiki->restInPeace();
        exit;
 }
 
-wfProfileOut( 'main-misc-setup' );
-
 # Setting global variables in mediaWiki
 $mediaWiki->setVal( 'action', $action );
 $mediaWiki->setVal( 'CommandLineMode', $wgCommandLineMode );
@@ -90,7 +90,7 @@ $mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
 $mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
 
 $mediaWiki->initialize( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
-$mediaWiki->finalCleanup( $wgDeferredUpdateList, $wgLoadBalancer, $wgOut );
+$mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgOut );
 
 # Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup
 $mediaWiki->doUpdates( $wgPostCommitUpdateList );