X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=index.php;h=dcea36b5b751ef877a8ccd806ebb0b33dc9f0293;hb=d9e6d84035e78ae37f2193f88302f4d4b8d73e97;hp=1176e8c3b8a7c35060a8bc7c336d3f6575f7b8eb;hpb=c2433e3be2084a1e7d20874ec5e9532d8a5ac48d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/index.php b/index.php
index 1176e8c3b8..dcea36b5b7 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,7 @@
  *
  * ----------
  *
- * Copyright (C) 2001-2009 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
+ * Copyright (C) 2001-2010 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, Yuri Astrakhan, Aryeh Gregor,
  * Aaron Schulz and others.
@@ -36,13 +36,11 @@
  * @file
  */
 
-
 # Initialise common code
 $preIP = dirname( __FILE__ );
 require_once( "$preIP/includes/WebStart.php" );
 
 # Initialize MediaWiki base class
-require_once( "$preIP/includes/Wiki.php" );
 $mediaWiki = new MediaWiki();
 
 wfProfileIn( 'main-misc-setup' );
@@ -57,8 +55,9 @@ if( !is_null( $maxLag ) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
 $action = $wgRequest->getVal( 'action', 'view' );
 $title = $wgRequest->getVal( 'title' );
 
+# Set title from request parameters
 $wgTitle = $mediaWiki->checkInitialQueries( $title, $action );
-if( $wgTitle === NULL ) {
+if( $wgTitle === null ) {
 	unset( $wgTitle );
 }
 
@@ -71,7 +70,6 @@ if( $wgUseAjax && $action == 'ajax' ) {
 	require_once( $IP . '/includes/AjaxDispatcher.php' );
 	$dispatcher = new AjaxDispatcher();
 	$dispatcher->performAction();
-	wfGetLBFactory()->commitMasterChanges();
 	$mediaWiki->restInPeace();
 	exit;
 }
@@ -114,7 +112,7 @@ $mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
 $mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
 $mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
 
-$mediaWiki->initialize( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
+$mediaWiki->performRequestForTitle( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
 $mediaWiki->finalCleanup( $wgDeferredUpdateList, $wgOut );
 
 # Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup