<?php
-
+#apd_set_pprof_trace();
# Main wiki script; see design.doc
#
$wgRequestTime = microtime();
die( "You'll have to <a href='config/index.php'>set the wiki up</a> first!" );
}
+# 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" );
require_once( "./LocalSettings.php" );
require_once( "includes/Setup.php" );
if( isset( $_SERVER['PATH_INFO'] ) && $wgUsePathInfo ) {
$title = substr( $_SERVER['PATH_INFO'], 1 );
+ if( !$wgUseLatin1 ) {
+ require_once( 'includes/normal/UtfNormal.php' );
+ $title = UtfNormal::toNFC( $title );
+ }
} else {
$title = $wgRequest->getVal( "title" );
}
exit;
}
-$db =& wfGetDB( DB_MASTER );
-
-if ( $search = $wgRequest->getText( 'search' ) ) {
+wfProfileIn( "main-action" );
+$search = $wgRequest->getText( 'search' );
+if( !is_null( $search ) && $search !== '' ) {
+ require_once( 'SearchEngine.php' );
$wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
- if( $wgRequest->getVal( 'fulltext' ) || !is_null( $wgRequest->getVal( 'offset' ) ) ) {
- wfSearch( $search );
+ $searchEngine = new SearchEngine( $search );
+ if( $wgRequest->getVal( 'fulltext' ) ||
+ !is_null( $wgRequest->getVal( 'offset' ) ) ||
+ !is_null ($wgRequest->getVal( 'searchx' ) ) ) {
+ $searchEngine->showResults();
} else {
- wfGo( $search );
+ $searchEngine->goResult();
}
} else if( !$wgTitle or $wgTitle->getDBkey() == "" ) {
$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
$wgOut->errorpage( "badtitle", "badtitletext" );
}
-} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title ) {
+} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title &&
+ !count( array_diff( array_keys( $_GET ), array( 'action', 'title' ) ) ) )
+{
/* redirect to canonical url, make it a 301 to allow caching */
$wgOut->redirect( $wgTitle->getFullURL(), '301');
} else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
SpecialPage::executePath( $wgTitle );
} else {
if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
- $wgTitle = Title::makeTitle( Namespace::getImage(), $wgTitle->getDBkey() );
+ $wgTitle = Title::makeTitle( NS_IMAGE, $wgTitle->getDBkey() );
}
switch( $wgTitle->getNamespace() ) {
require_once( "includes/ImagePage.php" );
$wgArticle = new ImagePage( $wgTitle );
break;
+ case NS_CATEGORY:
+ if ( $wgUseCategoryMagic ) {
+ require_once( "includes/CategoryPage.php" );
+ $wgArticle = new CategoryPage( $wgTitle );
+ break;
+ }
+ # NO break if wgUseCategoryMagic is false, drop through to next (default).
+ # Don't insert other cases between NS_CATEGORY and default.
default:
$wgArticle = new Article( $wgTitle );
}
- $db->query("BEGIN");
switch( $action ) {
case "view":
$wgOut->setSquidMaxage( $wgSquidMaxage );
case "rollback":
case "protect":
case "unprotect":
+ case "validate":
case "info":
+ case "markpatrolled":
$wgArticle->$action();
break;
case "print":
}
require_once( "includes/EditPage.php" );
$editor = new EditPage( $wgArticle );
- $editor->$action();
+ $editor->submit();
break;
case "history":
if ($_SERVER["REQUEST_URI"] == $wgTitle->getInternalURL('action=history')) {
default:
$wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
}
- $db->query("COMMIT");
}
+wfProfileOut( "main-action" );
-$wgLoadBalancer->saveMasterPos();
-$wgOut->output();
-
+# Deferred updates aren't really deferred anymore. It's important to report errors to the
+# user, and that means doing this before OutputPage::output(). Note that for page saves,
+# the client will wait until the script exits anyway before following the redirect.
+wfProfileIn( "main-updates" );
foreach ( $wgDeferredUpdateList as $up ) {
- $db->query("BEGIN");
$up->doUpdate();
- $db->query("COMMIT");
}
+wfProfileOut( "main-updates" );
+
+wfProfileIn( "main-cleanup" );
+$wgLoadBalancer->saveMasterPos();
+
+# Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
+$wgLoadBalancer->commitAll();
+
+$wgOut->output();
+wfProfileOut( "main-cleanup" );
+
logProfilingData();
+$wgLoadBalancer->closeAll();
wfDebug( "Request ended normally\n" );
?>