* (bug 20494) OutputPage::getArticleBodyOnly() no longer requires an useless argument

[lhc/web/wiklou.git] / includes / Wiki.php

diff --git a/includes/Wiki.php b/includes/Wiki.php
index a94d377..8c391e6 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -42,7 +42,6 @@ class MediaWiki {
        /**
         * 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
@@ -50,14 +49,19 @@ class MediaWiki {
         * @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 );
@@ -115,13 +119,15 @@ class MediaWiki {
                        if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 )
                                $wgContLang->findVariantLink( $title, $ret );
                }
+               # 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' );
-                       if( !$oldid )
-                               $oldid = $wgRequest->getInt( 'diff' );
+                       $oldid = $oldid ? $oldid : $wgRequest->getInt( 'diff' );
                        // Allow oldid to override a changed or missing title
-                       if( $oldid && ( $rev = Revision::newFromId( $oldid ) ) ) {
-                               $ret = $rev->getTitle();
+                       if( $oldid ) {
+                               $rev = Revision::newFromId( $oldid );
+                               $ret = $rev ? $rev->getTitle() : $ret;
                        }
                }
                return $ret;
@@ -147,8 +153,9 @@ class MediaWiki {
                # 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;
                }
@@ -181,7 +188,9 @@ class MediaWiki {
                        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() ) {
@@ -268,10 +277,11 @@ class MediaWiki {
         * 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' );
@@ -318,6 +328,7 @@ class MediaWiki {
                                                $rarticle->setRedirectedFrom( $title );
                                                $article = $rarticle;
                                                $title = $target;
+                                               $output->setTitle( $title );
                                        }
                                }
                        } else {
@@ -329,14 +340,16 @@ class MediaWiki {
        }
 
        /**
-        * 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!
@@ -344,8 +357,6 @@ class MediaWiki {
                # Do any deferred jobs
                $this->doUpdates( $deferredUpdates );
                $this->doJobs();
-               # Commit and close up!
-               $factory->shutdown();
                wfProfileOut( __METHOD__ );
        }
 
@@ -416,6 +427,10 @@ class MediaWiki {
         */
        function restInPeace() {
                wfLogProfilingData();
+               # Commit and close up!
+               $factory = wfGetLBFactory();
+               $factory->commitMasterChanges();
+               $factory->shutdown();
                wfDebug( "Request ended normally\n" );
        }
 
@@ -448,8 +463,10 @@ class MediaWiki {
                                $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':
@@ -515,9 +532,14 @@ class MediaWiki {
                                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' );