1 files changed, 18 insertions, 15 deletions

diff --git a/index.php b/index.php
index 46784400..4cadf788 100644
--- a/index.php
+++ b/index.php
@@ -15,7 +15,8 @@
  *
  * Copyright (C) 2001-2008 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
  * Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason,
- * Niklas Laxström, Domas Mituzas, Rob Church and others.
+ * Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor,
+ * Aaron Schulz and others.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,11 +57,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,29 +72,29 @@ 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( 'Server', $wgServer );
-$mediaWiki->setVal( 'DisableInternalSearch', $wgDisableInternalSearch );
 $mediaWiki->setVal( 'action', $action );
-$mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
-$mediaWiki->setVal( 'EnableDublinCoreRdf', $wgEnableDublinCoreRdf );
-$mediaWiki->setVal( 'EnableCreativeCommonsRdf', $wgEnableCreativeCommonsRdf );
 $mediaWiki->setVal( 'CommandLineMode', $wgCommandLineMode );
-$mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
 $mediaWiki->setVal( 'DisabledActions', $wgDisabledActions );
+$mediaWiki->setVal( 'DisableHardRedirects', $wgDisableHardRedirects );
+$mediaWiki->setVal( 'DisableInternalSearch', $wgDisableInternalSearch );
+$mediaWiki->setVal( 'EnableCreativeCommonsRdf', $wgEnableCreativeCommonsRdf );
+$mediaWiki->setVal( 'EnableDublinCoreRdf', $wgEnableDublinCoreRdf );
+$mediaWiki->setVal( 'JobRunRate', $wgJobRunRate );
+$mediaWiki->setVal( 'Server', $wgServer );
+$mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
+$mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
+$mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
 
-$wgArticle = $mediaWiki->initialize ( $wgTitle, $wgOut, $wgUser, $wgRequest );
-$mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgLoadBalancer, $wgOut );
+$mediaWiki->initialize( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
+$mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgOut );
 
 # Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup
 $mediaWiki->doUpdates( $wgPostCommitUpdateList );
 
-$mediaWiki->restInPeace( $wgLoadBalancer );
+$mediaWiki->restInPeace();