# Query string fields
$action = $wgRequest->getVal( "action", "view" );
-
-if( isset( $_SERVER['PATH_INFO'] ) && $wgUsePathInfo ) {
- $title = substr( $_SERVER['PATH_INFO'], 1 );
-} else {
- $title = $wgRequest->getVal( "title" );
-}
+$title = $wgRequest->getVal( "title" );
# Placeholders in case of DB error
$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
exit;
}
-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" );
$searchEngine = new SearchEngine( $search );
$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
$wgOut->errorpage( "badtitle", "badtitletext" );
}
-} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title &&
- !count( array_diff( array_keys( $_GET ), array( 'action', 'title' ) ) ) )
+} else if ( ( $action == "view" ) &&
+ (!isset( $_GET['title'] ) || $wgTitle->getPrefixedDBKey() != $_GET['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');
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 );
}
$wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
}
}
+wfProfileOut( "main-action" );
# 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 ) {
$up->doUpdate();
}
+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();