/**
* Initialization of ... everything
* Performs the request too
- * FIXME: why is this crap called "initialize" when it performs everything?
*
* @param $title Title ($wgTitle)
* @param $article Article
* @param $user User
* @param $request WebRequest
*/
- function initialize( &$title, &$article, &$output, &$user, $request ) {
+ function performRequestForTitle( &$title, &$article, &$output, &$user, $request ) {
wfProfileIn( __METHOD__ );
+
+ $output->setTitle( $title );
+
+ wfRunHooks( 'BeforeInitialize', array( &$title, &$article, &$output, &$user, $request, $this ) );
+
if( !$this->preliminaryChecks( $title, $output, $request ) ) {
wfProfileOut( __METHOD__ );
return;
}
- if( !$this->initializeSpecialCases( $title, $output, $request ) ) {
- $new_article = $this->initializeArticle( $title, $request );
+ // Call handleSpecialCases() to deal with all special requests...
+ if( !$this->handleSpecialCases( $title, $output, $request ) ) {
+ // ...otherwise treat it as an article view. The article
+ // may be a redirect to another article or URL.
+ $new_article = $this->initializeArticle( $title, $output, $request );
if( is_object( $new_article ) ) {
$article = $new_article;
$this->performAction( $output, $article, $title, $user, $request );
if( $wgRequest->getVal( 'printable' ) === 'yes' ) {
$wgOut->setPrintable();
}
- $ret = NULL;
+ $ret = null;
if( $curid = $wgRequest->getInt( 'curid' ) ) {
# URLs like this are generated by RC, because rc_title isn't always accurate
$ret = Title::newFromID( $curid );
- } elseif( '' == $title && 'delete' != $action ) {
+ } elseif( $title == '' && $action != 'delete' ) {
$ret = Title::newMainPage();
} else {
$ret = Title::newFromURL( $title );
if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 )
$wgContLang->findVariantLink( $title, $ret );
}
- if( ( $oldid = $wgRequest->getInt( 'oldid' ) )
- && ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) ) {
- // Allow oldid to override a changed or missing title.
- $rev = Revision::newFromId( $oldid );
- if( $rev ) {
- $ret = $rev->getTitle();
+ # For non-special titles, check for implicit titles
+ if( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) {
+ // We can have urls with just ?diff=,?oldid= or even just ?diff=
+ $oldid = $wgRequest->getInt( 'oldid' );
+ $oldid = $oldid ? $oldid : $wgRequest->getInt( 'diff' );
+ // Allow oldid to override a changed or missing title
+ if( $oldid ) {
+ $rev = Revision::newFromId( $oldid );
+ $ret = $rev ? $rev->getTitle() : $ret;
}
}
return $ret;
# the Read array in order for the user to see it. (We have to check here to
# catch special pages etc. We check again in Article::view())
if( !is_null( $title ) && !$title->userCanRead() ) {
+ global $wgDeferredUpdateList;
$output->loginToUse();
- $output->output();
+ $this->finalCleanup( $wgDeferredUpdateList, $output );
$output->disable();
return false;
}
* - redirect loop
* - special pages
*
- * FIXME: why is this crap called "initialize" when it performs everything?
- *
* @param $title Title
* @param $output OutputPage
* @param $request WebRequest
* @return bool true if the request is already executed
*/
- function initializeSpecialCases( &$title, &$output, $request ) {
+ function handleSpecialCases( &$title, &$output, $request ) {
wfProfileIn( __METHOD__ );
-
+ global $wgContLang, $wgUser;
$action = $this->getVal( 'Action' );
- if( is_null($title) || $title->getDBkey() == '' ) {
+ $perferred = $wgContLang->getPreferredVariant( false );
+
+ // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
+ if( is_null($title) || ( ($title->getDBkey() == '') && ($title->getInterwiki() == '') ) ) {
$title = SpecialPage::getTitleFor( 'Badtitle' );
# Die now before we mess up $wgArticle and the skin stops working
throw new ErrorPageError( 'badtitle', 'badtitletext' );
+
+ // Interwiki redirects
} else if( $title->getInterwiki() != '' ) {
if( $rdfrom = $request->getVal( 'rdfrom' ) ) {
$url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) );
} else {
- $url = $title->getFullURL();
+ $query = $request->getValues();
+ unset( $query['title'] );
+ $url = $title->getFullURL( $query );
}
/* Check for a redirect loop */
if( !preg_match( '/^' . preg_quote( $this->getVal('Server'), '/' ) . '/', $url ) && $title->isLocal() ) {
$output->redirect( $url );
} else {
$title = SpecialPage::getTitleFor( 'Badtitle' );
+ wfProfileOut( __METHOD__ );
throw new ErrorPageError( 'badtitle', 'badtitletext' );
}
+ // Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant
} else if( $action == 'view' && !$request->wasPosted() &&
- ( !isset($this->GET['title']) || $title->getPrefixedDBKey() != $this->GET['title'] ) &&
+ ( ( !isset($this->GET['title']) || $title->getPrefixedDBKey() != $this->GET['title'] ) ||
+ // No valid variant in URL (if the main-language has multi-variants), to ensure
+ // anonymous access would always be redirect to a URL with 'variant' parameter
+ ( !isset($this->GET['variant']) && $wgContLang->hasVariants() && !$wgUser->isLoggedIn() ) ) &&
!count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) )
{
- $targetUrl = $title->getFullURL();
+ if( !$wgUser->isLoggedIn() ) {
+ $pref = $wgContLang->getPreferredVariant( false, $fromHeader = true );
+ $targetUrl = $title->getFullURL( '', $variant = $pref );
+ }
+ else
+ $targetUrl = $title->getFullURL();
// Redirect to canonical url, make it a 301 to allow caching
if( $targetUrl == $request->getFullRequestURL() ) {
$message = "Redirect loop detected!\n\n" .
"to true.";
}
wfHttpError( 500, "Internal error", $message );
+ wfProfileOut( __METHOD__ );
return false;
} else {
$output->setSquidMaxage( 1200 );
$output->redirect( $targetUrl, '301' );
}
+ // Special pages
} else if( NS_SPECIAL == $title->getNamespace() ) {
/* actions that need to be made when we have a special pages */
SpecialPage::executePath( $title );
* Create an Article object for the page, following redirects if needed.
*
* @param $title Title ($wgTitle)
- * @param $request WebRequest
+ * @param $output OutputPage ($wgOut)
+ * @param $request WebRequest ($wgRequest)
* @return mixed an Article, or a string to redirect to another URL
*/
- function initializeArticle( &$title, $request ) {
+ function initializeArticle( &$title, &$output, $request ) {
wfProfileIn( __METHOD__ );
$action = $this->getVal( 'action', 'view' );
wfRunHooks( 'InitializeArticleMaybeRedirect',
array(&$title,&$request,&$ignoreRedirect,&$target,&$article) );
- // Follow redirects only for... redirects
- if( !$ignoreRedirect && $article->isRedirect() ) {
+ // Follow redirects only for... redirects.
+ // If $target is set, then a hook wanted to redirect.
+ if( !$ignoreRedirect && ($target || $article->isRedirect()) ) {
# Is the target already set by an extension?
$target = $target ? $target : $article->followRedirect();
if( is_string( $target ) ) {
if( !$this->getVal( 'DisableHardRedirects' ) ) {
// we'll need to redirect
+ wfProfileOut( __METHOD__ );
return $target;
}
}
$rarticle->setRedirectedFrom( $title );
$article = $rarticle;
$title = $target;
+ $output->setTitle( $title );
}
}
} else {
}
/**
- * Cleaning up by doing deferred updates, calling LBFactory and doing the output
+ * Cleaning up request by doing:
+ ** deferred updates, DB transaction, and the output
*
* @param $deferredUpdates array of updates to do
* @param $output OutputPage
*/
function finalCleanup( &$deferredUpdates, &$output ) {
wfProfileIn( __METHOD__ );
- # Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
+ # Now commit any transactions, so that unreported errors after
+ # output() don't roll back the whole DB transaction
$factory = wfGetLBFactory();
$factory->commitMasterChanges();
# Output everything!
# Do any deferred jobs
$this->doUpdates( $deferredUpdates );
$this->doJobs();
- # Commit and close up!
- $factory->shutdown();
wfProfileOut( __METHOD__ );
}
*/
function restInPeace() {
wfLogProfilingData();
+ # Commit and close up!
+ $factory = wfGetLBFactory();
+ $factory->commitMasterChanges();
+ $factory->shutdown();
wfDebug( "Request ended normally\n" );
}
$action = 'nosuchaction';
}
+ # Workaround for bug #20966: inability of IE to provide an action dependent
+ # on which submit button is clicked.
+ if ( $action === 'historysubmit' ) {
+ if ( $request->getBool( 'revisiondelete' ) ) {
+ $action = 'revisiondelete';
+ } else {
+ $action = 'view';
+ }
+ }
+
switch( $action ) {
case 'view':
$output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) );
$article->view();
break;
case 'raw': // includes JS/CSS
+ wfProfileIn( __METHOD__.'-raw' );
$raw = new RawPage( $article );
$raw->view();
+ wfProfileOut( __METHOD__.'-raw' );
break;
case 'watch':
case 'unwatch':
if( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) {
$output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) );
}
- $history = new PageHistory( $article );
+ $history = new HistoryPage( $article );
$history->history();
break;
+ case 'revisiondelete':
+ # For show/hide submission from history page
+ $special = SpecialPage::getPage( 'Revisiondelete' );
+ $special->execute( '' );
+ break;
default:
if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) {
$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
scripts.mit.edu / autoinstallsdev / mediawiki.git / blobdiff