/**
* 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 );
+ $new_article = $this->initializeArticle( $title, $output, $request );
if( is_object( $new_article ) ) {
$article = $new_article;
$this->performAction( $output, $article, $title, $user, $request );
# 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;
}
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() ) {
* 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 ) ) {
$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" );
}
$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' );