* (bug 3224) Allow minor edits by bots to skip new message notification on

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

diff --git a/index.php b/index.php
index eb8531f..964770e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,60 +1,54 @@
 <?php
-/**
- * Main wiki script; see docs/design.txt
- * @package MediaWiki
- */
-
-# In the beginning...
-require_once( "./includes/Wiki.php" );
-$wgRequestTime = microtime();
-$wgRUstart = MediaWiki::getRUsage();
-unset( $IP );
-MediaWiki::ckeckGlobalsVulnerability();
-
-# Valid web server entry point, enable includes.
-# Please don't move this line to includes/Defines.php. This line essentially defines
-# a valid entry point. If you put it in includes/Defines.php, then any script that includes
-# it becomes an entry point, thereby defeating its purpose.
-define( 'MEDIAWIKI', true );
-require_once( './includes/Defines.php' );
 
+# Initialise common code
+require_once( './includes/WebStart.php' );
 
 # Initialize MediaWiki base class
+require_once( "includes/Wiki.php" );
 $mediaWiki = new MediaWiki();
-$mediaWiki->checkSetup();
-
-# These can't be done in mdiaWiki.php for some weird reason
-require_once( './LocalSettings.php' );
-require_once( 'includes/Setup.php' );
 
+wfProfileIn( 'main-misc-setup' );
 OutputPage::setEncodings(); # Not really used yet
 
-$mediaWiki->setVal( "Request", $wgRequest );
-
 # Query string fields
-$mediaWiki->initializeActionTitle();
-$action = $mediaWiki->getVal( 'action' ); # Global might be needed somewhere, sadly...
-
-# Run initial queries
-$wgTitle = $mediaWiki->checkInitialQueries( $wgOut, $wgContLang );
+$action = $wgRequest->getVal( 'action', 'view' );
+$title = $wgRequest->getVal( 'title' );
+
+#
+# Send Ajax requests to the Ajax dispatcher.
+#
+if ( $wgUseAjax && $action == 'ajax' ) {
+       require_once( $IP . '/includes/AjaxDispatcher.php' );
+
+       $dispatcher = new AjaxDispatcher();
+       $dispatcher->performAction();
+       $mediaWiki->restInPeace( $wgLoadBalancer );
+       exit;
+}
 
-# Is this necessary? Who knows...
+$wgTitle = $mediaWiki->checkInitialQueries( $title,$action,$wgOut, $wgRequest, $wgContLang );
 if ($wgTitle == NULL) {
        unset( $wgTitle );
 }
 
+wfProfileOut( 'main-misc-setup' );
+
 # Setting global variables in mediaWiki
-$mediaWiki->setVal( "Server", $wgServer );
-$mediaWiki->setVal( "DisableInternalSearch", $wgDisableInternalSearch );
-$mediaWiki->setVal( "SquidMaxage", $wgSquidMaxage );
-$mediaWiki->setVal( "EnableDublinCoreRdf", $wgEnableDublinCoreRdf );
-$mediaWiki->setVal( "EnableCreativeCommonsRdf", $wgEnableCreativeCommonsRdf );
-$mediaWiki->setVal( "CommandLineMode", $wgCommandLineMode );
-$mediaWiki->setVal( "UseExternalEditor", $wgUseExternalEditor );
-$mediaWiki->setVal( "DisabledActions", $wgDisabledActions );
-
-$wgArticle = $mediaWiki->initialize ( $wgTitle, $wgOut, $wgUser );
+$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 );
+
+$wgArticle = $mediaWiki->initialize ( $wgTitle, $wgOut, $wgUser, $wgRequest );
 $mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgLoadBalancer, $wgOut );
+
+# Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup
 $mediaWiki->doUpdates( $wgPostCommitUpdateList );
+
 $mediaWiki->restInPeace( $wgLoadBalancer );
 ?>