]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/Article.php
MediaWiki 1.17.0
[autoinstallsdev/mediawiki.git] / includes / Article.php
index 7ba55c548b73b0c00f3e4799837f8bd0746e8eed..3e8cfd5e3ab5903800dd55a8c04d7eefb9889067 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 /**
  * File for articles
+ * @file
  */
 
 /**
  * Note: edit user interface and cache support functions have been
  * moved to separate EditPage and HTMLFileCache classes.
  *
+ * @internal documentation reviewed 15 Mar 2010
  */
 class Article {
        /**@{{
         * @private
         */
-       var $mComment;                  //!<
-       var $mContent;                  //!<
-       var $mContentLoaded;    //!<
-       var $mCounter;                  //!<
-       var $mForUpdate;                //!<
-       var $mGoodAdjustment;   //!<
-       var $mLatest;                   //!<
-       var $mMinorEdit;                //!<
-       var $mOldId;                    //!<
-       var $mRedirectedFrom;   //!<
-       var $mRedirectUrl;              //!<
-       var $mRevIdFetched;             //!<
-       var $mRevision;                 //!<
-       var $mTimestamp;                //!<
-       var $mTitle;                    //!<
-       var $mTotalAdjustment;  //!<
-       var $mTouched;                  //!<
-       var $mUser;                             //!<
-       var $mUserText;                 //!<
+       var $mComment = '';               // !<
+       var $mContent;                    // !<
+       var $mContentLoaded = false;      // !<
+       var $mCounter = -1;               // !< Not loaded
+       var $mCurID = -1;                 // !< Not loaded
+       var $mDataLoaded = false;         // !<
+       var $mForUpdate = false;          // !<
+       var $mGoodAdjustment = 0;         // !<
+       var $mIsRedirect = false;         // !<
+       var $mLatest = false;             // !<
+       var $mMinorEdit;                  // !<
+       var $mOldId;                      // !<
+       var $mPreparedEdit = false;       // !< Title object if set
+       var $mRedirectedFrom = null;      // !< Title object if set
+       var $mRedirectTarget = null;      // !< Title object if set
+       var $mRedirectUrl = false;        // !<
+       var $mRevIdFetched = 0;           // !<
+       var $mRevision;                   // !< Revision object if set
+       var $mTimestamp = '';             // !<
+       var $mTitle;                      // !< Title object
+       var $mTotalAdjustment = 0;        // !<
+       var $mTouched = '19700101000000'; // !<
+       var $mUser = -1;                  // !< Not loaded
+       var $mUserText = '';              // !< username from Revision if set
+       var $mParserOptions;              // !< ParserOptions object
+       var $mParserOutput;               // !< ParserCache object if set
        /**@}}*/
 
-       /**
-        * Constants used by internal components to get rollback results
-        */
-       const SUCCESS = 0;                      // Operation successful
-       const PERM_DENIED = 1;          // Permission denied
-       const BLOCKED = 2;                      // User has been blocked
-       const READONLY = 3;                     // Wiki is in read-only mode
-       const BAD_TOKEN = 4;            // Invalid token specified
-       const BAD_TITLE = 5;            // $this is not a valid Article
-       const ALREADY_ROLLED = 6;       // Someone else already rolled this back. $from and $summary will be set
-       const ONLY_AUTHOR = 7;          // User is the only author of the page
        /**
         * Constructor and clear the article
         * @param $title Reference to a Title object.
         * @param $oldId Integer revision ID, null to fetch from request, zero for current
         */
-       function __construct( &$title, $oldId = null ) {
+       public function __construct( Title $title, $oldId = null ) {
+               // FIXME: does the reference play any role here?
                $this->mTitle =& $title;
                $this->mOldId = $oldId;
-               $this->clear();
+       }
+
+       /**
+        * Constructor from an page id
+        * @param $id The article ID to load
+        */
+       public static function newFromID( $id ) {
+               $t = Title::newFromID( $id );
+               # FIXME: doesn't inherit right
+               return $t == null ? null : new self( $t );
+               # return $t == null ? null : new static( $t ); // PHP 5.3
        }
 
        /**
@@ -64,43 +72,133 @@ class Article {
         * from another page on the wiki.
         * @param $from Title object.
         */
-       function setRedirectedFrom( $from ) {
+       public function setRedirectedFrom( Title $from ) {
                $this->mRedirectedFrom = $from;
        }
 
        /**
+        * If this page is a redirect, get its target
+        *
+        * The target will be fetched from the redirect table if possible.
+        * If this page doesn't have an entry there, call insertRedirect()
+        * @return mixed Title object, or null if this page is not a redirect
+        */
+       public function getRedirectTarget() {
+               if ( !$this->mTitle->isRedirect() ) {
+                       return null;
+               }
+
+               if ( $this->mRedirectTarget !== null ) {
+                       return $this->mRedirectTarget;
+               }
+
+               # Query the redirect table
+               $dbr = wfGetDB( DB_SLAVE );
+               $row = $dbr->selectRow( 'redirect',
+                       array( 'rd_namespace', 'rd_title', 'rd_fragment', 'rd_interwiki' ),
+                       array( 'rd_from' => $this->getID() ),
+                       __METHOD__
+               );
+
+               // rd_fragment and rd_interwiki were added later, populate them if empty
+               if ( $row && !is_null( $row->rd_fragment ) && !is_null( $row->rd_interwiki ) ) {
+                       return $this->mRedirectTarget = Title::makeTitle(
+                               $row->rd_namespace, $row->rd_title,
+                               $row->rd_fragment, $row->rd_interwiki );
+               }
+
+               # This page doesn't have an entry in the redirect table
+               return $this->mRedirectTarget = $this->insertRedirect();
+       }
+
+       /**
+        * Insert an entry for this page into the redirect table.
+        *
+        * Don't call this function directly unless you know what you're doing.
+        * @return Title object or null if not a redirect
+        */
+       public function insertRedirect() {
+               // recurse through to only get the final target
+               $retval = Title::newFromRedirectRecurse( $this->getContent() );
+               if ( !$retval ) {
+                       return null;
+               }
+               $this->insertRedirectEntry( $retval );
+               return $retval;
+       }
+       
+       /**
+        * Insert or update the redirect table entry for this page to indicate
+        * it redirects to $rt .
+        * @param $rt Title redirect target
+        */
+       public function insertRedirectEntry( $rt ) {
+               $dbw = wfGetDB( DB_MASTER );
+               $dbw->replace( 'redirect', array( 'rd_from' ),
+                       array(
+                               'rd_from' => $this->getID(),
+                               'rd_namespace' => $rt->getNamespace(),
+                               'rd_title' => $rt->getDBkey(),
+                               'rd_fragment' => $rt->getFragment(),
+                               'rd_interwiki' => $rt->getInterwiki(),
+                       ),
+                       __METHOD__
+               );
+       }
+
+       /**
+        * Get the Title object or URL this page redirects to
+        *
         * @return mixed false, Title of in-wiki target, or string with URL
         */
-       function followRedirect() {
-               $text = $this->getContent();
-               $rt = Title::newFromRedirect( $text );
+       public function followRedirect() {
+               return $this->getRedirectURL( $this->getRedirectTarget() );
+       }
 
-               # process if title object is valid and not special:userlogout
-               if( $rt ) {
-                       if( $rt->getInterwiki() != '' ) {
-                               if( $rt->isLocal() ) {
+       /**
+        * Get the Title object this text redirects to
+        *
+        * @param $text string article content containing redirect info
+        * @return mixed false, Title of in-wiki target, or string with URL
+        * @deprecated
+        */
+       public function followRedirectText( $text ) {
+               // recurse through to only get the final target
+               return $this->getRedirectURL( Title::newFromRedirectRecurse( $text ) );
+       }
+       
+       /**
+        * Get the Title object or URL to use for a redirect. We use Title
+        * objects for same-wiki, non-special redirects and URLs for everything
+        * else.
+        * @param $rt Title Redirect target
+        * @return mixed false, Title object of local target, or string with URL
+        */
+       public function getRedirectURL( $rt ) {
+               if ( $rt ) {
+                       if ( $rt->getInterwiki() != '' ) {
+                               if ( $rt->isLocal() ) {
                                        // Offsite wikis need an HTTP redirect.
                                        //
                                        // This can be hard to reverse and may produce loops,
                                        // so they may be disabled in the site configuration.
-
                                        $source = $this->mTitle->getFullURL( 'redirect=no' );
                                        return $rt->getFullURL( 'rdfrom=' . urlencode( $source ) );
                                }
                        } else {
-                               if( $rt->getNamespace() == NS_SPECIAL ) {
+                               if ( $rt->getNamespace() == NS_SPECIAL ) {
                                        // Gotta handle redirects to special pages differently:
                                        // Fill the HTTP response "Location" header and ignore
                                        // the rest of the page we're on.
                                        //
                                        // This can be hard to reverse, so they may be disabled.
-
-                                       if( $rt->isSpecial( 'Userlogout' ) ) {
+                                       if ( $rt->isSpecial( 'Userlogout' ) ) {
                                                // rolleyes
                                        } else {
                                                return $rt->getFullURL();
                                        }
                                }
+
                                return $rt;
                        }
                }
@@ -110,22 +208,25 @@ class Article {
        }
 
        /**
-        * get the title object of the article
+        * Get the title object of the article
+        * @return Title object of this page
         */
-       function getTitle() {
+       public function getTitle() {
                return $this->mTitle;
        }
 
        /**
-         * Clear the object
-         * @private
-         */
-       function clear() {
+        * Clear the object
+        * FIXME: shouldn't this be public?
+        * @private
+        */
+       public function clear() {
                $this->mDataLoaded    = false;
                $this->mContentLoaded = false;
 
                $this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded
                $this->mRedirectedFrom = null; # Title object if set
+               $this->mRedirectTarget = null; # Title object if set
                $this->mUserText =
                $this->mTimestamp = $this->mComment = '';
                $this->mGoodAdjustment = $this->mTotalAdjustment = 0;
@@ -135,40 +236,63 @@ class Article {
                $this->mRevIdFetched = 0;
                $this->mRedirectUrl = false;
                $this->mLatest = false;
+               $this->mPreparedEdit = false;
        }
 
        /**
         * Note that getContent/loadContent do not follow redirects anymore.
         * If you need to fetch redirectable content easily, try
-        * the shortcut in Article::followContent()
-        * FIXME
-        * @todo There are still side-effects in this!
-        *        In general, you should use the Revision class, not Article,
-        *        to fetch text for purposes other than page views.
+        * the shortcut in Article::followRedirect()
+        *
+        * This function has side effects! Do not use this function if you
+        * only want the real revision text if any.
         *
         * @return Return the text of this revision
-       */
-       function getContent() {
-               global $wgUser, $wgOut;
+        */
+       public function getContent() {
+               global $wgUser, $wgContLang, $wgMessageCache;
 
                wfProfileIn( __METHOD__ );
 
-               if ( 0 == $this->getID() ) {
-                       wfProfileOut( __METHOD__ );
-                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
-
+               if ( $this->getID() === 0 ) {
+                       # If this is a MediaWiki:x message, then load the messages
+                       # and return the message value for x.
                        if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                               $ret = wfMsgWeirdKey ( $this->mTitle->getText() ) ;
+                               # If this is a system message, get the default text.
+                               list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) );
+                               $text = wfMsgGetKey( $message, false, $lang, false );
+
+                               if ( wfEmptyMsg( $message, $text ) )
+                                       $text = '';
                        } else {
-                               $ret = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
+                               $text = wfMsgExt( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon', 'parsemag' );
                        }
+                       wfProfileOut( __METHOD__ );
 
-                       return "<div class='noarticletext'>$ret</div>";
+                       return $text;
                } else {
                        $this->loadContent();
                        wfProfileOut( __METHOD__ );
+
+                       return $this->mContent;
+               }
+       }
+
+       /**
+        * Get the text of the current revision. No side-effects...
+        *
+        * @return Return the text of the current revision
+        */
+       public function getRawText() {
+               // Check process cache for current revision
+               if ( $this->mContentLoaded && $this->mOldId == 0 ) {
                        return $this->mContent;
                }
+
+               $rev = Revision::newFromTitle( $this->mTitle );
+               $text = $rev ? $rev->getRawText() : false;
+
+               return $text;
        }
 
        /**
@@ -183,19 +307,51 @@ class Article {
         * @return string text of the requested section
         * @deprecated
         */
-       function getSection($text,$section) {
+       public function getSection( $text, $section ) {
                global $wgParser;
                return $wgParser->getSection( $text, $section );
        }
 
+       /**
+        * Get the text that needs to be saved in order to undo all revisions
+        * between $undo and $undoafter. Revisions must belong to the same page,
+        * must exist and must not be deleted
+        * @param $undo Revision
+        * @param $undoafter Revision Must be an earlier revision than $undo
+        * @return mixed string on success, false on failure
+        */
+       public function getUndoText( Revision $undo, Revision $undoafter = null ) {
+               $currentRev = Revision::newFromTitle( $this->mTitle );
+               if ( !$currentRev ) {
+                       return false; // no page
+               }
+               $undo_text = $undo->getText();
+               $undoafter_text = $undoafter->getText();
+               $cur_text = $currentRev->getText();
+
+               if ( $cur_text == $undo_text ) {
+                       # No use doing a merge if it's just a straight revert.
+                       return $undoafter_text;
+               }
+
+               $undone_text = '';
+
+               if ( !wfMerge( $undo_text, $undoafter_text, $cur_text, $undone_text ) ) {
+                       return false;
+               }
+
+               return $undone_text;
+       }
+
        /**
         * @return int The oldid of the article that is to be shown, 0 for the
         *             current revision
         */
-       function getOldID() {
+       public function getOldID() {
                if ( is_null( $this->mOldId ) ) {
                        $this->mOldId = $this->getOldIDFromRequest();
                }
+
                return $this->mOldId;
        }
 
@@ -204,15 +360,18 @@ class Article {
         *
         * @return int The old id for the request
         */
-       function getOldIDFromRequest() {
+       public function getOldIDFromRequest() {
                global $wgRequest;
+
                $this->mRedirectUrl = false;
+
                $oldid = $wgRequest->getVal( 'oldid' );
+
                if ( isset( $oldid ) ) {
                        $oldid = intval( $oldid );
                        if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
                                $nextid = $this->mTitle->getNextRevisionID( $oldid );
-                               if ( $nextid  ) {
+                               if ( $nextid ) {
                                        $oldid = $nextid;
                                } else {
                                        $this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' );
@@ -221,17 +380,14 @@ class Article {
                                $previd = $this->mTitle->getPreviousRevisionID( $oldid );
                                if ( $previd ) {
                                        $oldid = $previd;
-                               } else {
-                                       # TODO
                                }
                        }
-                       # unused:
-                       # $lastid = $oldid;
                }
 
                if ( !$oldid ) {
                        $oldid = 0;
                }
+
                return $oldid;
        }
 
@@ -239,25 +395,26 @@ class Article {
         * Load the revision (including text) into this object
         */
        function loadContent() {
-               if ( $this->mContentLoaded ) return;
+               if ( $this->mContentLoaded ) {
+                       return;
+               }
 
-               # Query variables :P
-               $oldid = $this->getOldID();
+               wfProfileIn( __METHOD__ );
 
-               # Pre-fill content with error message so that if something
-               # fails we'll have something telling us what we intended.
+               $oldid = $this->getOldID();
                $this->mOldId = $oldid;
                $this->fetchContent( $oldid );
-       }
 
+               wfProfileOut( __METHOD__ );
+       }
 
        /**
         * Fetch a page record with the given conditions
-        * @param Database $dbr
-        * @param array    $conditions
-        * @private
+        * @param $dbr Database object
+        * @param $conditions Array
+        * @return mixed Database result resource, or false on failure
         */
-       function pageData( $dbr, $conditions ) {
+       protected function pageData( $dbr, $conditions ) {
                $fields = array(
                                'page_id',
                                'page_namespace',
@@ -271,32 +428,37 @@ class Article {
                                'page_latest',
                                'page_len',
                );
+
                wfRunHooks( 'ArticlePageDataBefore', array( &$this, &$fields ) );
-               $row = $dbr->selectRow(
-                       'page',
-                       $fields,
-                       $conditions,
-                       __METHOD__
-               );
+
+               $row = $dbr->selectRow( 'page', $fields, $conditions, __METHOD__ );
+
                wfRunHooks( 'ArticlePageDataAfter', array( &$this, &$row ) );
-               return $row ;
+
+               return $row;
        }
 
        /**
-        * @param Database $dbr
-        * @param Title $title
+        * Fetch a page record matching the Title object's namespace and title
+        * using a sanitized title string
+        *
+        * @param $dbr Database object
+        * @param $title Title object
+        * @return mixed Database result resource, or false on failure
         */
-       function pageDataFromTitle( $dbr, $title ) {
+       public function pageDataFromTitle( $dbr, $title ) {
                return $this->pageData( $dbr, array(
                        'page_namespace' => $title->getNamespace(),
                        'page_title'     => $title->getDBkey() ) );
        }
 
        /**
-        * @param Database $dbr
-        * @param int $id
+        * Fetch a page record matching the requested ID
+        *
+        * @param $dbr Database
+        * @param $id Integer
         */
-       function pageDataFromId( $dbr, $id ) {
+       protected function pageDataFromId( $dbr, $id ) {
                return $this->pageData( $dbr, array( 'page_id' => $id ) );
        }
 
@@ -304,103 +466,104 @@ class Article {
         * Set the general counter, title etc data loaded from
         * some source.
         *
-        * @param object $data
-        * @private
+        * @param $data Database row object or "fromdb"
         */
-       function loadPageData( $data = 'fromdb' ) {
+       public function loadPageData( $data = 'fromdb' ) {
                if ( $data === 'fromdb' ) {
-                       $dbr = $this->getDB();
+                       $dbr = wfGetDB( DB_MASTER );
                        $data = $this->pageDataFromId( $dbr, $this->getId() );
                }
 
-               $lc =& LinkCache::singleton();
+               $lc = LinkCache::singleton();
+
                if ( $data ) {
-                       $lc->addGoodLinkObj( $data->page_id, $this->mTitle );
+                       $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect, $data->page_latest );
 
-                       $this->mTitle->mArticleID = $data->page_id;
+                       $this->mTitle->mArticleID = intval( $data->page_id );
 
-                       # Old-fashioned restrictions.
+                       # Old-fashioned restrictions
                        $this->mTitle->loadRestrictions( $data->page_restrictions );
 
-                       $this->mCounter     = $data->page_counter;
+                       $this->mCounter     = intval( $data->page_counter );
                        $this->mTouched     = wfTimestamp( TS_MW, $data->page_touched );
-                       $this->mIsRedirect  = $data->page_is_redirect;
-                       $this->mLatest      = $data->page_latest;
+                       $this->mIsRedirect  = intval( $data->page_is_redirect );
+                       $this->mLatest      = intval( $data->page_latest );
                } else {
-                       if ( is_object( $this->mTitle ) ) {
-                               $lc->addBadLinkObj( $this->mTitle );
-                       }
+                       $lc->addBadLinkObj( $this->mTitle );
                        $this->mTitle->mArticleID = 0;
                }
 
-               $this->mDataLoaded  = true;
+               $this->mDataLoaded = true;
        }
 
        /**
         * Get text of an article from database
         * Does *NOT* follow redirects.
-        * @param int $oldid 0 for whatever the latest revision is
-        * @return string
+        *
+        * @param $oldid Int: 0 for whatever the latest revision is
+        * @return mixed string containing article contents, or false if null
         */
        function fetchContent( $oldid = 0 ) {
                if ( $this->mContentLoaded ) {
                        return $this->mContent;
                }
 
-               $dbr = $this->getDB();
+               $dbr = wfGetDB( DB_MASTER );
 
                # Pre-fill content with error message so that if something
                # fails we'll have something telling us what we intended.
                $t = $this->mTitle->getPrefixedText();
-               if( $oldid ) {
-                       $t .= ',oldid='.$oldid;
-               }
-               $this->mContent = wfMsg( 'missingarticle', $t ) ;
+               $d = $oldid ? wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid ) : '';
+               $this->mContent = wfMsgNoTrans( 'missing-article', $t, $d ) ;
 
-               if( $oldid ) {
+               if ( $oldid ) {
                        $revision = Revision::newFromId( $oldid );
-                       if( is_null( $revision ) ) {
-                               wfDebug( __METHOD__." failed to retrieve specified revision, id $oldid\n" );
+                       if ( $revision === null ) {
+                               wfDebug( __METHOD__ . " failed to retrieve specified revision, id $oldid\n" );
                                return false;
                        }
+
                        $data = $this->pageDataFromId( $dbr, $revision->getPage() );
-                       if( !$data ) {
-                               wfDebug( __METHOD__." failed to get page data linked to revision id $oldid\n" );
+
+                       if ( !$data ) {
+                               wfDebug( __METHOD__ . " failed to get page data linked to revision id $oldid\n" );
                                return false;
                        }
+
                        $this->mTitle = Title::makeTitle( $data->page_namespace, $data->page_title );
                        $this->loadPageData( $data );
                } else {
-                       if( !$this->mDataLoaded ) {
+                       if ( !$this->mDataLoaded ) {
                                $data = $this->pageDataFromTitle( $dbr, $this->mTitle );
-                               if( !$data ) {
-                                       wfDebug( __METHOD__." failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" );
+
+                               if ( !$data ) {
+                                       wfDebug( __METHOD__ . " failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" );
                                        return false;
                                }
+
                                $this->loadPageData( $data );
                        }
                        $revision = Revision::newFromId( $this->mLatest );
-                       if( is_null( $revision ) ) {
-                               wfDebug( __METHOD__." failed to retrieve current page, rev_id {$data->page_latest}\n" );
+                       if (  $revision === null ) {
+                               wfDebug( __METHOD__ . " failed to retrieve current page, rev_id {$this->mLatest}\n" );
                                return false;
                        }
                }
 
                // FIXME: Horrible, horrible! This content-loading interface just plain sucks.
                // We should instead work with the Revision object when we need it...
-               $this->mContent = $revision->userCan( Revision::DELETED_TEXT ) ? $revision->getRawText() : "";
-               //$this->mContent   = $revision->getText();
+               $this->mContent   = $revision->getText( Revision::FOR_THIS_USER ); // Loads if user is allowed
 
                $this->mUser      = $revision->getUser();
                $this->mUserText  = $revision->getUserText();
                $this->mComment   = $revision->getComment();
                $this->mTimestamp = wfTimestamp( TS_MW, $revision->getTimestamp() );
 
-               $this->mRevIdFetched = $revision->getID();
+               $this->mRevIdFetched = $revision->getId();
                $this->mContentLoaded = true;
                $this->mRevision =& $revision;
 
-               wfRunHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) ) ;
+               wfRunHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) );
 
                return $this->mContent;
        }
@@ -409,20 +572,12 @@ class Article {
         * Read/write accessor to select FOR UPDATE
         *
         * @param $x Mixed: FIXME
+        * @return mixed value of $x, or value stored in Article::mForUpdate
         */
-       function forUpdate( $x = NULL ) {
+       public function forUpdate( $x = null ) {
                return wfSetVar( $this->mForUpdate, $x );
        }
 
-       /**
-        * Get the database which should be used for reads
-        *
-        * @return Database
-        */
-       function getDB() {
-               return wfGetDB( DB_MASTER );
-       }
-
        /**
         * Get options for all SELECT statements
         *
@@ -430,7 +585,7 @@ class Article {
         *                       the default
         * @return Array: options
         */
-       function getSelectOptions( $options = '' ) {
+       protected function getSelectOptions( $options = '' ) {
                if ( $this->mForUpdate ) {
                        if ( is_array( $options ) ) {
                                $options[] = 'FOR UPDATE';
@@ -438,75 +593,94 @@ class Article {
                                $options = 'FOR UPDATE';
                        }
                }
+
                return $options;
        }
 
        /**
         * @return int Page ID
         */
-       function getID() {
-               if( $this->mTitle ) {
-                       return $this->mTitle->getArticleID();
-               } else {
-                       return 0;
-               }
+       public function getID() {
+               return $this->mTitle->getArticleID();
        }
 
        /**
         * @return bool Whether or not the page exists in the database
         */
-       function exists() {
-               return $this->getId() != 0;
+       public function exists() {
+               return $this->getId() > 0;
+       }
+
+       /**
+        * Check if this page is something we're going to be showing
+        * some sort of sensible content for. If we return false, page
+        * views (plain action=view) will return an HTTP 404 response,
+        * so spiders and robots can know they're following a bad link.
+        *
+        * @return bool
+        */
+       public function hasViewableContent() {
+               return $this->exists() || $this->mTitle->isAlwaysKnown();
        }
 
        /**
         * @return int The view count for the page
         */
-       function getCount() {
+       public function getCount() {
                if ( -1 == $this->mCounter ) {
                        $id = $this->getID();
+
                        if ( $id == 0 ) {
                                $this->mCounter = 0;
                        } else {
                                $dbr = wfGetDB( DB_SLAVE );
-                               $this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
-                                       'Article::getCount', $this->getSelectOptions() );
+                               $this->mCounter = $dbr->selectField( 'page',
+                                       'page_counter',
+                                       array( 'page_id' => $id ),
+                                       __METHOD__,
+                                       $this->getSelectOptions()
+                               );
                        }
                }
+
                return $this->mCounter;
        }
 
        /**
-        * Determine whether a page  would be suitable for being counted as an
+        * Determine whether a page would be suitable for being counted as an
         * article in the site_stats table based on the title & its content
         *
         * @param $text String: text to analyze
         * @return bool
         */
-       function isCountable( $text ) {
+       public function isCountable( $text ) {
                global $wgUseCommaCount;
 
                $token = $wgUseCommaCount ? ',' : '[[';
-               return
-                       $this->mTitle->isContentPage()
-                       && !$this->isRedirect( $text )
-                       && in_string( $token, $text );
+
+               return $this->mTitle->isContentPage() && !$this->isRedirect( $text ) && in_string( $token, $text );
        }
 
        /**
         * Tests if the article text represents a redirect
         *
-        * @param $text String: FIXME
+        * @param $text mixed string containing article contents, or boolean
         * @return bool
         */
-       function isRedirect( $text = false ) {
+       public function isRedirect( $text = false ) {
                if ( $text === false ) {
+                       if ( $this->mDataLoaded ) {
+                               return $this->mIsRedirect;
+                       }
+
+                       // Apparently loadPageData was never called
                        $this->loadContent();
-                       $titleObj = Title::newFromRedirect( $this->fetchContent() );
+                       $titleObj = Title::newFromRedirectRecurse( $this->fetchContent() );
                } else {
                        $titleObj = Title::newFromRedirect( $text );
                }
-               return $titleObj !== NULL;
+
+               return $titleObj !== null;
        }
 
        /**
@@ -514,497 +688,1051 @@ class Article {
         * to this page (and it exists).
         * @return bool
         */
-       function isCurrent() {
+       public function isCurrent() {
                # If no oldid, this is the current version.
-               if ($this->getOldID() == 0)
+               if ( $this->getOldID() == 0 ) {
                        return true;
+               }
 
-               return $this->exists() &&
-                       isset( $this->mRevision ) &&
-                       $this->mRevision->isCurrent();
+               return $this->exists() && isset( $this->mRevision ) && $this->mRevision->isCurrent();
        }
 
        /**
         * Loads everything except the text
         * This isn't necessary for all uses, so it's only done if needed.
-        * @private
         */
-       function loadLastEdit() {
-               if ( -1 != $this->mUser )
+       protected function loadLastEdit() {
+               if ( -1 != $this->mUser ) {
                        return;
+               }
 
                # New or non-existent articles have no user information
                $id = $this->getID();
-               if ( 0 == $id ) return;
+               if ( 0 == $id ) {
+                       return;
+               }
 
-               $this->mLastRevision = Revision::loadFromPageId( $this->getDB(), $id );
-               if( !is_null( $this->mLastRevision ) ) {
+               $this->mLastRevision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id );
+               if ( !is_null( $this->mLastRevision ) ) {
                        $this->mUser      = $this->mLastRevision->getUser();
                        $this->mUserText  = $this->mLastRevision->getUserText();
                        $this->mTimestamp = $this->mLastRevision->getTimestamp();
                        $this->mComment   = $this->mLastRevision->getComment();
                        $this->mMinorEdit = $this->mLastRevision->isMinor();
-                       $this->mRevIdFetched = $this->mLastRevision->getID();
+                       $this->mRevIdFetched = $this->mLastRevision->getId();
                }
        }
 
-       function getTimestamp() {
+       /**
+        * @return string GMT timestamp of last article revision
+        **/
+
+       public function getTimestamp() {
                // Check if the field has been filled by ParserCache::get()
                if ( !$this->mTimestamp ) {
                        $this->loadLastEdit();
                }
-               return wfTimestamp(TS_MW, $this->mTimestamp);
+
+               return wfTimestamp( TS_MW, $this->mTimestamp );
        }
 
-       function getUser() {
+       /**
+        * @return int user ID for the user that made the last article revision
+        */
+       public function getUser() {
                $this->loadLastEdit();
                return $this->mUser;
        }
 
-       function getUserText() {
+       /**
+        * @return string username of the user that made the last article revision
+        */
+       public function getUserText() {
                $this->loadLastEdit();
                return $this->mUserText;
        }
 
-       function getComment() {
+       /**
+        * @return string Comment stored for the last article revision
+        */
+       public function getComment() {
                $this->loadLastEdit();
                return $this->mComment;
        }
 
-       function getMinorEdit() {
+       /**
+        * Returns true if last revision was marked as "minor edit"
+        *
+        * @return boolean Minor edit indicator for the last article revision.
+        */
+       public function getMinorEdit() {
                $this->loadLastEdit();
                return $this->mMinorEdit;
        }
 
-       function getRevIdFetched() {
+       /**
+        * Use this to fetch the rev ID used on page views
+        *
+        * @return int revision ID of last article revision
+        */
+       public function getRevIdFetched() {
                $this->loadLastEdit();
                return $this->mRevIdFetched;
        }
 
        /**
-        * @todo Document, fixme $offset never used.
+        * FIXME: this does what?
         * @param $limit Integer: default 0.
         * @param $offset Integer: default 0.
+        * @return UserArrayFromResult object with User objects of article contributors for requested range
         */
-       function getContributors($limit = 0, $offset = 0) {
-               # XXX: this is expensive; cache this info somewhere.
+       public function getContributors( $limit = 0, $offset = 0 ) {
+               # FIXME: this is expensive; cache this info somewhere.
 
-               $contribs = array();
                $dbr = wfGetDB( DB_SLAVE );
                $revTable = $dbr->tableName( 'revision' );
                $userTable = $dbr->tableName( 'user' );
-               $user = $this->getUser();
+
                $pageId = $this->getId();
 
-               $sql = "SELECT rev_user, rev_user_text, user_real_name, MAX(rev_timestamp) as timestamp
+               $user = $this->getUser();
+
+               if ( $user ) {
+                       $excludeCond = "AND rev_user != $user";
+               } else {
+                       $userText = $dbr->addQuotes( $this->getUserText() );
+                       $excludeCond = "AND rev_user_text != $userText";
+               }
+
+               $deletedBit = $dbr->bitAnd( 'rev_deleted', Revision::DELETED_USER ); // username hidden?
+
+               $sql = "SELECT {$userTable}.*, rev_user_text as user_name, MAX(rev_timestamp) as timestamp
                        FROM $revTable LEFT JOIN $userTable ON rev_user = user_id
                        WHERE rev_page = $pageId
-                       AND rev_user != $user
-                       GROUP BY rev_user, rev_user_text, user_real_name
+                       $excludeCond
+                       AND $deletedBit = 0
+                       GROUP BY rev_user, rev_user_text
                        ORDER BY timestamp DESC";
 
-               if ($limit > 0) { $sql .= ' LIMIT '.$limit; }
-               $sql .= ' '. $this->getSelectOptions();
-
-               $res = $dbr->query($sql, __METHOD__);
-
-               while ( $line = $dbr->fetchObject( $res ) ) {
-                       $contribs[] = array($line->rev_user, $line->rev_user_text, $line->user_real_name);
+               if ( $limit > 0 ) {
+                       $sql = $dbr->limitResult( $sql, $limit, $offset );
                }
 
-               $dbr->freeResult($res);
-               return $contribs;
+               $sql .= ' ' . $this->getSelectOptions();
+               $res = $dbr->query( $sql, __METHOD__ );
+
+               return new UserArrayFromResult( $res );
        }
 
        /**
-        * This is the default action of the script: just view the page of
-        * the given title.
-       */
-       function view() {
-               global $wgUser, $wgOut, $wgRequest, $wgContLang;
-               global $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol, $wgParser;
-               global $wgUseTrackbacks, $wgNamespaceRobotPolicies, $wgArticleRobotPolicies;
-               $sk = $wgUser->getSkin();
+        * This is the default action of the index.php entry point: just view the
+        * page of the given title.
+        */
+       public function view() {
+               global $wgUser, $wgOut, $wgRequest, $wgParser;
+               global $wgUseFileCache, $wgUseETag;
 
                wfProfileIn( __METHOD__ );
 
-               $parserCache =& ParserCache::singleton();
-               $ns = $this->mTitle->getNamespace(); # shortcut
-
                # Get variables from query string
                $oldid = $this->getOldID();
+               $parserCache = ParserCache::singleton();
+
+               $parserOptions = $this->getParserOptions();
+               # Render printable version, use printable version cache
+               if ( $wgOut->isPrintable() ) {
+                       $parserOptions->setIsPrintable( true );
+                       $parserOptions->setEditSection( false );
+               } else if ( $wgUseETag && !$this->mTitle->quickUserCan( 'edit' ) ) {
+                       $parserOptions->setEditSection( false );
+               }
+
+               # Try client and file cache
+               if ( $oldid === 0 && $this->checkTouched() ) {
+                       if ( $wgUseETag ) {
+                               $wgOut->setETag( $parserCache->getETag( $this, $parserOptions ) );
+                       }
+
+                       # Is it client cached?
+                       if ( $wgOut->checkLastModified( $this->getTouched() ) ) {
+                               wfDebug( __METHOD__ . ": done 304\n" );
+                               wfProfileOut( __METHOD__ );
+
+                               return;
+                       # Try file cache
+                       } else if ( $wgUseFileCache && $this->tryFileCache() ) {
+                               wfDebug( __METHOD__ . ": done file cache\n" );
+                               # tell wgOut that output is taken care of
+                               $wgOut->disable();
+                               $this->viewUpdates();
+                               wfProfileOut( __METHOD__ );
+
+                               return;
+                       }
+               }
 
                # getOldID may want us to redirect somewhere else
                if ( $this->mRedirectUrl ) {
                        $wgOut->redirect( $this->mRedirectUrl );
+                       wfDebug( __METHOD__ . ": redirecting due to oldid\n" );
                        wfProfileOut( __METHOD__ );
+
                        return;
                }
 
-               $diff = $wgRequest->getVal( 'diff' );
-               $rcid = $wgRequest->getVal( 'rcid' );
-               $rdfrom = $wgRequest->getVal( 'rdfrom' );
-               $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
-
                $wgOut->setArticleFlag( true );
+               # Set page title (may be overridden by DISPLAYTITLE)
+               $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
 
-               # Discourage indexing of printable versions, but encourage following
-               if( $wgOut->isPrintable() ) {
-                       $policy = 'noindex,follow';
-               } elseif ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) {
-                       $policy = $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()];
-               } elseif( isset( $wgNamespaceRobotPolicies[$ns] ) ) {
-                       # Honour customised robot policies for this namespace
-                       $policy = $wgNamespaceRobotPolicies[$ns];
-               } else {
-                       # Default to encourage indexing and following links
-                       $policy = 'index,follow';
-               }
-               $wgOut->setRobotPolicy( $policy );
-
-               # If we got diff and oldid in the query, we want to see a
-               # diff page instead of the article.
-
-               if ( !is_null( $diff ) ) {
-                       $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-
-                       $de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid );
-                       // DifferenceEngine directly fetched the revision:
-                       $this->mRevIdFetched = $de->mNewid;
-                       $de->showDiffPage( $diffOnly );
-
-                       // Needed to get the page's current revision
-                       $this->loadPageData();
-                       if( $diff == 0 || $diff == $this->mLatest ) {
-                               # Run view updates for current revision only
-                               $this->viewUpdates();
-                       }
+               # If we got diff in the query, we want to see a diff page instead of the article.
+               if ( $wgRequest->getCheck( 'diff' ) ) {
+                       wfDebug( __METHOD__ . ": showing diff page\n" );
+                       $this->showDiffPage();
                        wfProfileOut( __METHOD__ );
+
                        return;
                }
 
-               if ( empty( $oldid ) && $this->checkTouched() ) {
-                       $wgOut->setETag($parserCache->getETag($this, $wgUser));
+               # Allow frames by default
+               $wgOut->allowClickjacking();
 
-                       if( $wgOut->checkLastModified( $this->mTouched ) ){
-                               wfProfileOut( __METHOD__ );
-                               return;
-                       } else if ( $this->tryFileCache() ) {
-                               # tell wgOut that output is taken care of
-                               $wgOut->disable();
-                               $this->viewUpdates();
-                               wfProfileOut( __METHOD__ );
-                               return;
-                       }
+               if ( !$wgUseETag && !$this->mTitle->quickUserCan( 'edit' ) ) {
+                       $parserOptions->setEditSection( false );
                }
 
                # Should the parser cache be used?
-               $pcache = $wgEnableParserCache
-                       && intval( $wgUser->getOption( 'stubthreshold' ) ) == 0
-                       && $this->exists()
-                       && empty( $oldid )
-                       && !$this->mTitle->isCssOrJsPage()
-                       && !$this->mTitle->isCssJsSubpage();
-               wfDebug( 'Article::view using parser cache: ' . ($pcache ? 'yes' : 'no' ) . "\n" );
-               if ( $wgUser->getOption( 'stubthreshold' ) ) {
+               $useParserCache = $this->useParserCache( $oldid );
+               wfDebug( 'Article::view using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
+               if ( $wgUser->getStubThreshold() ) {
                        wfIncrStats( 'pcache_miss_stub' );
                }
 
-               $wasRedirected = false;
-               if ( isset( $this->mRedirectedFrom ) ) {
-                       // This is an internally redirected page view.
-                       // We'll need a backlink to the source page for navigation.
-                       if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
-                               $sk = $wgUser->getSkin();
-                               $redir = $sk->makeKnownLinkObj( $this->mRedirectedFrom, '', 'redirect=no' );
-                               $s = wfMsg( 'redirectedfrom', $redir );
-                               $wgOut->setSubtitle( $s );
-
-                               // Set the fragment if one was specified in the redirect
-                               if ( strval( $this->mTitle->getFragment() ) != '' ) {
-                                       $fragment = Xml::escapeJsString( $this->mTitle->getFragmentForURL() );
-                                       $wgOut->addInlineScript( "redirectToFragment(\"$fragment\");" );
-                               }
-                               $wasRedirected = true;
-                       }
-               } elseif ( !empty( $rdfrom ) ) {
-                       // This is an externally redirected view, from some other wiki.
-                       // If it was reported from a trusted site, supply a backlink.
-                       global $wgRedirectSources;
-                       if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
-                               $sk = $wgUser->getSkin();
-                               $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
-                               $s = wfMsg( 'redirectedfrom', $redir );
-                               $wgOut->setSubtitle( $s );
-                               $wasRedirected = true;
-                       }
-               }
+               $wasRedirected = $this->showRedirectedFromHeader();
+               $this->showNamespaceHeader();
 
+               # Iterate through the possible ways of constructing the output text.
+               # Keep going until $outputDone is set, or we run out of things to do.
+               $pass = 0;
                $outputDone = false;
-               wfRunHooks( 'ArticleViewHeader', array( &$this, &$outputDone, &$pcache ) );
-               if ( $pcache ) {
-                       if ( $wgOut->tryParserCache( $this, $wgUser ) ) {
-                               // Ensure that UI elements requiring revision ID have
-                               // the correct version information.
-                               $wgOut->setRevisionId( $this->mLatest );
-                               $outputDone = true;
-                       }
-               }
-               if ( !$outputDone ) {
-                       $text = $this->getContent();
-                       if ( $text === false ) {
-                               # Failed to load, replace text with error message
-                               $t = $this->mTitle->getPrefixedText();
-                               if( $oldid ) {
-                                       $t .= ',oldid='.$oldid;
-                                       $text = wfMsg( 'missingarticle', $t );
-                               } else {
-                                       $text = wfMsg( 'noarticletext', $t );
-                               }
-                       }
-
-                       # Another whitelist check in case oldid is altering the title
-                       if ( !$this->mTitle->userCanRead() ) {
-                               $wgOut->loginToUse();
-                               $wgOut->output();
-                               exit;
-                       }
-
-                       # We're looking at an old revision
+               $this->mParserOutput = false;
 
-                       if ( !empty( $oldid ) ) {
-                               $wgOut->setRobotpolicy( 'noindex,nofollow' );
-                               if( is_null( $this->mRevision ) ) {
-                                       // FIXME: This would be a nice place to load the 'no such page' text.
-                               } else {
-                                       $this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
-                                       if( $this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
-                                               if( !$this->mRevision->userCan( Revision::DELETED_TEXT ) ) {
-                                                       $wgOut->addWikiText( wfMsg( 'rev-deleted-text-permission' ) );
-                                                       $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-                                                       return;
-                                               } else {
-                                                       $wgOut->addWikiText( wfMsg( 'rev-deleted-text-view' ) );
-                                                       // and we are allowed to see...
+               while ( !$outputDone && ++$pass ) {
+                       switch( $pass ) {
+                               case 1:
+                                       wfRunHooks( 'ArticleViewHeader', array( &$this, &$outputDone, &$useParserCache ) );
+                                       break;
+                               case 2:
+                                       # Try the parser cache
+                                       if ( $useParserCache ) {
+                                               $this->mParserOutput = $parserCache->get( $this, $parserOptions );
+
+                                               if ( $this->mParserOutput !== false ) {
+                                                       wfDebug( __METHOD__ . ": showing parser cache contents\n" );
+                                                       $wgOut->addParserOutput( $this->mParserOutput );
+                                                       # Ensure that UI elements requiring revision ID have
+                                                       # the correct version information.
+                                                       $wgOut->setRevisionId( $this->mLatest );
+                                                       $outputDone = true;
+                                               }
+                                       }
+                                       break;
+                               case 3:
+                                       $text = $this->getContent();
+                                       if ( $text === false || $this->getID() == 0 ) {
+                                               wfDebug( __METHOD__ . ": showing missing article\n" );
+                                               $this->showMissingArticle();
+                                               wfProfileOut( __METHOD__ );
+                                               return;
+                                       }
+
+                                       # Another whitelist check in case oldid is altering the title
+                                       if ( !$this->mTitle->userCanRead() ) {
+                                               wfDebug( __METHOD__ . ": denied on secondary read check\n" );
+                                               $wgOut->loginToUse();
+                                               $wgOut->output();
+                                               $wgOut->disable();
+                                               wfProfileOut( __METHOD__ );
+                                               return;
+                                       }
+
+                                       # Are we looking at an old revision
+                                       if ( $oldid && !is_null( $this->mRevision ) ) {
+                                               $this->setOldSubtitle( $oldid );
+
+                                               if ( !$this->showDeletedRevisionHeader() ) {
+                                                       wfDebug( __METHOD__ . ": cannot view deleted revision\n" );
+                                                       wfProfileOut( __METHOD__ );
+                                                       return;
+                                               }
+
+                                               # If this "old" version is the current, then try the parser cache...
+                                               if ( $oldid === $this->getLatest() && $this->useParserCache( false ) ) {
+                                                       $this->mParserOutput = $parserCache->get( $this, $parserOptions );
+                                                       if ( $this->mParserOutput ) {
+                                                               wfDebug( __METHOD__ . ": showing parser cache for current rev permalink\n" );                                                           
+                                                               $wgOut->addParserOutput( $this->mParserOutput );
+                                                               $wgOut->setRevisionId( $this->mLatest );
+                                                               $outputDone = true;
+                                                               break;                                                          
+                                                       }
                                                }
                                        }
-                               }
 
+                                       # Ensure that UI elements requiring revision ID have
+                                       # the correct version information.
+                                       $wgOut->setRevisionId( $this->getRevIdFetched() );
+
+                                       # Pages containing custom CSS or JavaScript get special treatment
+                                       if ( $this->mTitle->isCssOrJsPage() || $this->mTitle->isCssJsSubpage() ) {
+                                               wfDebug( __METHOD__ . ": showing CSS/JS source\n" );
+                                               $this->showCssOrJsPage();
+                                               $outputDone = true;
+                                       } else {
+                                               $rt = Title::newFromRedirectArray( $text );
+                                               if ( $rt ) {
+                                                       wfDebug( __METHOD__ . ": showing redirect=no page\n" );
+                                                       # Viewing a redirect page (e.g. with parameter redirect=no)
+                                                       # Don't append the subtitle if this was an old revision
+                                                       $wgOut->addHTML( $this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() ) );
+                                                       # Parse just to get categories, displaytitle, etc.
+                                                       $this->mParserOutput = $wgParser->parse( $text, $this->mTitle, $parserOptions );
+                                                       $wgOut->addParserOutputNoText( $this->mParserOutput );
+                                                       $outputDone = true;
+                                               }
+                                       }
+                                       break;
+                               case 4:
+                                       # Run the parse, protected by a pool counter
+                                       wfDebug( __METHOD__ . ": doing uncached parse\n" );
+
+                                       $key = $parserCache->getKey( $this, $parserOptions );
+                                       $poolArticleView = new PoolWorkArticleView( $this, $key, $useParserCache, $parserOptions );
+                                       
+                                       if ( !$poolArticleView->execute() ) {
+                                               # Connection or timeout error
+                                               wfProfileOut( __METHOD__ );
+                                               return;
+                                       } else {
+                                               $outputDone = true;
+                                       }
+                                       break;
+                               # Should be unreachable, but just in case...
+                               default:
+                                       break 2;
                        }
                }
-               if( !$outputDone ) {
-                       $wgOut->setRevisionId( $this->getRevIdFetched() );
-                       
-                        // Pages containing custom CSS or JavaScript get special treatment
-                       if( $this->mTitle->isCssOrJsPage() || $this->mTitle->isCssJsSubpage() ) {
-                               $wgOut->addHtml( wfMsgExt( 'clearyourcache', 'parse' ) );
-
-                               // Give hooks a chance to customise the output
-                               if( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->mTitle, $wgOut ) ) ) {
-                                       // Wrap the whole lot in a <pre> and don't parse
-                                       $m = array();
-                                       preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );
-                                       $wgOut->addHtml( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
-                                       $wgOut->addHtml( htmlspecialchars( $this->mContent ) );
-                                       $wgOut->addHtml( "\n</pre>\n" );
-                               }
-                       
+
+               # Adjust the title if it was set by displaytitle, -{T|}- or language conversion
+               if ( $this->mParserOutput ) {
+                       $titleText = $this->mParserOutput->getTitleText();
+
+                       if ( strval( $titleText ) !== '' ) {
+                               $wgOut->setPageTitle( $titleText );
                        }
-                       
-                       elseif ( $rt = Title::newFromRedirect( $text ) ) {
-                               # Display redirect
-                               $imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
-                               $imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png';
-                               # Don't overwrite the subtitle if this was an old revision
-                               if( !$wasRedirected && $this->isCurrent() ) {
-                                       $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) );
-                               }
-                               $link = $sk->makeLinkObj( $rt, $rt->getFullText() );
+               }
 
-                               $wgOut->addHTML( '<img src="'.$imageUrl.'" alt="#REDIRECT " />' .
-                                 '<span class="redirectText">'.$link.'</span>' );
+               # For the main page, overwrite the <title> element with the con-
+               # tents of 'pagetitle-view-mainpage' instead of the default (if
+               # that's not empty).
+               # This message always exists because it is in the i18n files
+               if ( $this->mTitle->equals( Title::newMainPage() )
+                       && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' ) ) !== '' )
+               {
+                       $wgOut->setHTMLTitle( $m );
+               }
 
-                               $parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
-                               $wgOut->addParserOutputNoText( $parseout );
-                       } else if ( $pcache ) {
-                               # Display content and save to parser cache
-                               $this->outputWikiText( $text );
-                       } else {
-                               # Display content, don't attempt to save to parser cache
-                               # Don't show section-edit links on old revisions... this way lies madness.
-                               if( !$this->isCurrent() ) {
-                                       $oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false );
-                               }
-                               # Display content and don't save to parser cache
-                               # With timing hack -- TS 2006-07-26
-                               $time = -wfTime();
-                               $this->outputWikiText( $text, false );
-                               $time += wfTime();
-
-                               # Timing hack
-                               if ( $time > 3 ) {
-                                       wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time,
-                                               $this->mTitle->getPrefixedDBkey()));
+               # Now that we've filled $this->mParserOutput, we know whether
+               # there are any __NOINDEX__ tags on the page
+               $policy = $this->getRobotPolicy( 'view' );
+               $wgOut->setIndexPolicy( $policy['index'] );
+               $wgOut->setFollowPolicy( $policy['follow'] );
+
+               $this->showViewFooter();
+               $this->viewUpdates();
+               wfProfileOut( __METHOD__ );
+       }
+
+       /**
+        * Show a diff page according to current request variables. For use within
+        * Article::view() only, other callers should use the DifferenceEngine class.
+        */
+       public function showDiffPage() {
+               global $wgRequest, $wgUser;
+
+               $diff = $wgRequest->getVal( 'diff' );
+               $rcid = $wgRequest->getVal( 'rcid' );
+               $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
+               $purge = $wgRequest->getVal( 'action' ) == 'purge';
+               $unhide = $wgRequest->getInt( 'unhide' ) == 1;
+               $oldid = $this->getOldID();
+
+               $de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid, $purge, $unhide );
+               // DifferenceEngine directly fetched the revision:
+               $this->mRevIdFetched = $de->mNewid;
+               $de->showDiffPage( $diffOnly );
+
+               // Needed to get the page's current revision
+               $this->loadPageData();
+               if ( $diff == 0 || $diff == $this->mLatest ) {
+                       # Run view updates for current revision only
+                       $this->viewUpdates();
+               }
+       }
+
+       /**
+        * Show a page view for a page formatted as CSS or JavaScript. To be called by
+        * Article::view() only.
+        *
+        * This is hooked by SyntaxHighlight_GeSHi to do syntax highlighting of these
+        * page views.
+        */
+       protected function showCssOrJsPage() {
+               global $wgOut;
+
+               $wgOut->wrapWikiMsg( "<div id='mw-clearyourcache'>\n$1\n</div>", 'clearyourcache' );
+
+               // Give hooks a chance to customise the output
+               if ( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->mTitle, $wgOut ) ) ) {
+                       // Wrap the whole lot in a <pre> and don't parse
+                       $m = array();
+                       preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );
+                       $wgOut->addHTML( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
+                       $wgOut->addHTML( htmlspecialchars( $this->mContent ) );
+                       $wgOut->addHTML( "\n</pre>\n" );
+               }
+       }
+
+       /**
+        * Get the robot policy to be used for the current view
+        * @param $action String the action= GET parameter
+        * @return Array the policy that should be set
+        * TODO: actions other than 'view'
+        */
+       public function getRobotPolicy( $action ) {
+               global $wgOut, $wgArticleRobotPolicies, $wgNamespaceRobotPolicies;
+               global $wgDefaultRobotPolicy, $wgRequest;
+
+               $ns = $this->mTitle->getNamespace();
+
+               if ( $ns == NS_USER || $ns == NS_USER_TALK ) {
+                       # Don't index user and user talk pages for blocked users (bug 11443)
+                       if ( !$this->mTitle->isSubpage() ) {
+                               $block = new Block();
+                               if ( $block->load( $this->mTitle->getText() ) ) {
+                                       return array(
+                                               'index'  => 'noindex',
+                                               'follow' => 'nofollow'
+                                       );
                                }
+                       }
+               }
+
+               if ( $this->getID() === 0 || $this->getOldID() ) {
+                       # Non-articles (special pages etc), and old revisions
+                       return array(
+                               'index'  => 'noindex',
+                               'follow' => 'nofollow'
+                       );
+               } elseif ( $wgOut->isPrintable() ) {
+                       # Discourage indexing of printable versions, but encourage following
+                       return array(
+                               'index'  => 'noindex',
+                               'follow' => 'follow'
+                       );
+               } elseif ( $wgRequest->getInt( 'curid' ) ) {
+                       # For ?curid=x urls, disallow indexing
+                       return array(
+                               'index'  => 'noindex',
+                               'follow' => 'follow'
+                       );
+               }
+
+               # Otherwise, construct the policy based on the various config variables.
+               $policy = self::formatRobotPolicy( $wgDefaultRobotPolicy );
+
+               if ( isset( $wgNamespaceRobotPolicies[$ns] ) ) {
+                       # Honour customised robot policies for this namespace
+                       $policy = array_merge(
+                               $policy,
+                               self::formatRobotPolicy( $wgNamespaceRobotPolicies[$ns] )
+                       );
+               }
+               if ( $this->mTitle->canUseNoindex() && is_object( $this->mParserOutput ) && $this->mParserOutput->getIndexPolicy() ) {
+                       # __INDEX__ and __NOINDEX__ magic words, if allowed. Incorporates
+                       # a final sanity check that we have really got the parser output.
+                       $policy = array_merge(
+                               $policy,
+                               array( 'index' => $this->mParserOutput->getIndexPolicy() )
+                       );
+               }
+
+               if ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) {
+                       # (bug 14900) site config can override user-defined __INDEX__ or __NOINDEX__
+                       $policy = array_merge(
+                               $policy,
+                               self::formatRobotPolicy( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] )
+                       );
+               }
+
+               return $policy;
+       }
 
-                               if( !$this->isCurrent() ) {
-                                       $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
+       /**
+        * Converts a String robot policy into an associative array, to allow
+        * merging of several policies using array_merge().
+        * @param $policy Mixed, returns empty array on null/false/'', transparent
+        *            to already-converted arrays, converts String.
+        * @return associative Array: 'index' => <indexpolicy>, 'follow' => <followpolicy>
+        */
+       public static function formatRobotPolicy( $policy ) {
+               if ( is_array( $policy ) ) {
+                       return $policy;
+               } elseif ( !$policy ) {
+                       return array();
+               }
+
+               $policy = explode( ',', $policy );
+               $policy = array_map( 'trim', $policy );
+
+               $arr = array();
+               foreach ( $policy as $var ) {
+                       if ( in_array( $var, array( 'index', 'noindex' ) ) ) {
+                               $arr['index'] = $var;
+                       } elseif ( in_array( $var, array( 'follow', 'nofollow' ) ) ) {
+                               $arr['follow'] = $var;
+                       }
+               }
+
+               return $arr;
+       }
+
+       /**
+        * If this request is a redirect view, send "redirected from" subtitle to
+        * $wgOut. Returns true if the header was needed, false if this is not a
+        * redirect view. Handles both local and remote redirects.
+        *
+        * @return boolean
+        */
+       public function showRedirectedFromHeader() {
+               global $wgOut, $wgUser, $wgRequest, $wgRedirectSources;
+
+               $rdfrom = $wgRequest->getVal( 'rdfrom' );
+               $sk = $wgUser->getSkin();
+
+               if ( isset( $this->mRedirectedFrom ) ) {
+                       // This is an internally redirected page view.
+                       // We'll need a backlink to the source page for navigation.
+                       if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
+                               $redir = $sk->link(
+                                       $this->mRedirectedFrom,
+                                       null,
+                                       array(),
+                                       array( 'redirect' => 'no' ),
+                                       array( 'known', 'noclasses' )
+                               );
+
+                               $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
+                               $wgOut->setSubtitle( $s );
+
+                               // Set the fragment if one was specified in the redirect
+                               if ( strval( $this->mTitle->getFragment() ) != '' ) {
+                                       $fragment = Xml::escapeJsString( $this->mTitle->getFragmentForURL() );
+                                       $wgOut->addInlineScript( "redirectToFragment(\"$fragment\");" );
                                }
 
+                               // Add a <link rel="canonical"> tag
+                               $wgOut->addLink( array( 'rel' => 'canonical',
+                                       'href' => $this->mTitle->getLocalURL() )
+                               );
+
+                               return true;
+                       }
+               } elseif ( $rdfrom ) {
+                       // This is an externally redirected view, from some other wiki.
+                       // If it was reported from a trusted site, supply a backlink.
+                       if ( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
+                               $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
+                               $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
+                               $wgOut->setSubtitle( $s );
+
+                               return true;
                        }
                }
-               /* title may have been set from the cache */
-               $t = $wgOut->getPageTitle();
-               if( empty( $t ) ) {
-                       $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+
+               return false;
+       }
+
+       /**
+        * Show a header specific to the namespace currently being viewed, like
+        * [[MediaWiki:Talkpagetext]]. For Article::view().
+        */
+       public function showNamespaceHeader() {
+               global $wgOut;
+
+               if ( $this->mTitle->isTalkPage() ) {
+                       $msg = wfMsgNoTrans( 'talkpageheader' );
+                       if ( $msg !== '-' && !wfEmptyMsg( 'talkpageheader', $msg ) ) {
+                               $wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1\n</div>", array( 'talkpageheader' ) );
+                       }
                }
+       }
+
+       /**
+        * Show the footer section of an ordinary page view
+        */
+       public function showViewFooter() {
+               global $wgOut, $wgUseTrackbacks;
 
                # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
-               if( $ns == NS_USER_TALK &&
-                       User::isIP( $this->mTitle->getText() ) ) {
-                       $wgOut->addWikiText( wfMsg('anontalkpagetext') );
+               if ( $this->mTitle->getNamespace() == NS_USER_TALK && IP::isValid( $this->mTitle->getText() ) ) {
+                       $wgOut->addWikiMsg( 'anontalkpagetext' );
                }
 
                # If we have been passed an &rcid= parameter, we want to give the user a
                # chance to mark this new article as patrolled.
-               if ( $wgUseRCPatrol && !is_null( $rcid ) && $rcid != 0 && $wgUser->isAllowed( 'patrol' ) ) {
-                       $wgOut->addHTML(
-                               "<div class='patrollink'>" .
-                                       wfMsgHtml( 'markaspatrolledlink',
-                                       $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml('markaspatrolledtext'),
-                                               "action=markpatrolled&rcid=$rcid" )
-                                       ) .
-                               '</div>'
-                        );
-               }
+               $this->showPatrolFooter();
 
                # Trackbacks
-               if ($wgUseTrackbacks)
+               if ( $wgUseTrackbacks ) {
                        $this->addTrackbacks();
+               }
+       }
 
-               $this->viewUpdates();
-               wfProfileOut( __METHOD__ );
+       /**
+        * If patrol is possible, output a patrol UI box. This is called from the
+        * footer section of ordinary page views. If patrol is not possible or not
+        * desired, does nothing.
+        */
+       public function showPatrolFooter() {
+               global $wgOut, $wgRequest, $wgUser;
+
+               $rcid = $wgRequest->getVal( 'rcid' );
+
+               if ( !$rcid || !$this->mTitle->quickUserCan( 'patrol' ) ) {
+                       return;
+               }
+
+               $sk = $wgUser->getSkin();
+               $token = $wgUser->editToken( $rcid );
+               $wgOut->preventClickjacking();
+
+               $wgOut->addHTML(
+                       "<div class='patrollink'>" .
+                               wfMsgHtml(
+                                       'markaspatrolledlink',
+                                       $sk->link(
+                                               $this->mTitle,
+                                               wfMsgHtml( 'markaspatrolledtext' ),
+                                               array(),
+                                               array(
+                                                       'action' => 'markpatrolled',
+                                                       'rcid' => $rcid,
+                                                       'token' => $token,
+                                               ),
+                                               array( 'known', 'noclasses' )
+                                       )
+                               ) .
+                       '</div>'
+               );
+       }
+
+       /**
+        * Show the error text for a missing article. For articles in the MediaWiki
+        * namespace, show the default message text. To be called from Article::view().
+        */
+       public function showMissingArticle() {
+               global $wgOut, $wgRequest, $wgUser;
+
+               # Show info in user (talk) namespace. Does the user exist? Is he blocked?
+               if ( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
+                       $parts = explode( '/', $this->mTitle->getText() );
+                       $rootPart = $parts[0];
+                       $user = User::newFromName( $rootPart, false /* allow IP users*/ );
+                       $ip = User::isIP( $rootPart );
+
+                       if ( !$user->isLoggedIn() && !$ip ) { # User does not exist
+                               $wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n\$1\n</div>",
+                                       array( 'userpage-userdoesnotexist-view', $rootPart ) );
+                       } else if ( $user->isBlocked() ) { # Show log extract if the user is currently blocked
+                               LogEventsList::showLogExtract(
+                                       $wgOut,
+                                       'block',
+                                       $user->getUserPage()->getPrefixedText(),
+                                       '',
+                                       array(
+                                               'lim' => 1,
+                                               'showIfEmpty' => false,
+                                               'msgKey' => array(
+                                                       'blocked-notice-logextract',
+                                                       $user->getName() # Support GENDER in notice
+                                               )
+                                       )
+                               );
+                       }
+               }
+
+               wfRunHooks( 'ShowMissingArticle', array( $this ) );
+
+               # Show delete and move logs
+               LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move' ), $this->mTitle->getPrefixedText(), '',
+                       array(  'lim' => 10,
+                               'conds' => array( "log_action != 'revision'" ),
+                               'showIfEmpty' => false,
+                               'msgKey' => array( 'moveddeleted-notice' ) )
+               );
+
+               # Show error message
+               $oldid = $this->getOldID();
+               if ( $oldid ) {
+                       $text = wfMsgNoTrans( 'missing-article',
+                               $this->mTitle->getPrefixedText(),
+                               wfMsgNoTrans( 'missingarticle-rev', $oldid ) );
+               } elseif ( $this->mTitle->getNamespace() === NS_MEDIAWIKI ) {
+                       // Use the default message text
+                       $text = $this->getContent();
+               } else {
+                       $createErrors = $this->mTitle->getUserPermissionsErrors( 'create', $wgUser );
+                       $editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser );
+                       $errors = array_merge( $createErrors, $editErrors );
+
+                       if ( !count( $errors ) ) {
+                               $text = wfMsgNoTrans( 'noarticletext' );
+                       } else {
+                               $text = wfMsgNoTrans( 'noarticletext-nopermission' );
+                       }
+               }
+               $text = "<div class='noarticletext'>\n$text\n</div>";
+
+               if ( !$this->hasViewableContent() ) {
+                       // If there's no backing content, send a 404 Not Found
+                       // for better machine handling of broken links.
+                       $wgRequest->response()->header( "HTTP/1.1 404 Not Found" );
+               }
+
+               $wgOut->addWikiText( $text );
+       }
+
+       /**
+        * If the revision requested for view is deleted, check permissions.
+        * Send either an error message or a warning header to $wgOut.
+        *
+        * @return boolean true if the view is allowed, false if not.
+        */
+       public function showDeletedRevisionHeader() {
+               global $wgOut, $wgRequest;
+
+               if ( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
+                       // Not deleted
+                       return true;
+               }
+
+               // If the user is not allowed to see it...
+               if ( !$this->mRevision->userCan( Revision::DELETED_TEXT ) ) {
+                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n",
+                               'rev-deleted-text-permission' );
+
+                       return false;
+               // If the user needs to confirm that they want to see it...
+               } else if ( $wgRequest->getInt( 'unhide' ) != 1 ) {
+                       # Give explanation and add a link to view the revision...
+                       $oldid = intval( $this->getOldID() );
+                       $link = $this->mTitle->getFullUrl( "oldid={$oldid}&unhide=1" );
+                       $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ?
+                               'rev-suppressed-text-unhide' : 'rev-deleted-text-unhide';
+                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n",
+                               array( $msg, $link ) );
+
+                       return false;
+               // We are allowed to see...
+               } else {
+                       $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ?
+                               'rev-suppressed-text-view' : 'rev-deleted-text-view';
+                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", $msg );
+
+                       return true;
+               }
+       }
+
+       /**
+        * Should the parser cache be used?
+        *
+        * @return boolean
+        */
+       public function useParserCache( $oldid ) {
+               global $wgUser, $wgEnableParserCache;
+
+               return $wgEnableParserCache
+                       && $wgUser->getStubThreshold() == 0
+                       && $this->exists()
+                       && empty( $oldid )
+                       && !$this->mTitle->isCssOrJsPage()
+                       && !$this->mTitle->isCssJsSubpage();
+       }
+
+       /**
+        * Execute the uncached parse for action=view
+        */
+       public function doViewParse() {
+               global $wgOut;
+
+               $oldid = $this->getOldID();
+               $parserOptions = $this->getParserOptions();
+
+               # Render printable version, use printable version cache
+               $parserOptions->setIsPrintable( $wgOut->isPrintable() );
+
+               # Don't show section-edit links on old revisions... this way lies madness.
+               if ( !$this->isCurrent() || $wgOut->isPrintable() || !$this->mTitle->quickUserCan( 'edit' ) ) {
+                       $parserOptions->setEditSection( false );
+               }
+               
+               $useParserCache = $this->useParserCache( $oldid );
+               $this->outputWikiText( $this->getContent(), $useParserCache, $parserOptions );
+               
+               return true;
        }
 
-       function addTrackbacks() {
+       /**
+        * Try to fetch an expired entry from the parser cache. If it is present,
+        * output it and return true. If it is not present, output nothing and
+        * return false. This is used as a callback function for
+        * PoolCounter::executeProtected().
+        *
+        * @return boolean
+        */
+       public function tryDirtyCache() {
+               global $wgOut;
+               $parserCache = ParserCache::singleton();
+               $options = $this->getParserOptions();
+               
+               if ( $wgOut->isPrintable() ) {
+                       $options->setIsPrintable( true );
+                       $options->setEditSection( false );
+               }
+               
+               $output = $parserCache->getDirty( $this, $options );
+
+               if ( $output ) {
+                       wfDebug( __METHOD__ . ": sending dirty output\n" );
+                       wfDebugLog( 'dirty', "dirty output " . $parserCache->getKey( $this, $options ) . "\n" );
+                       $wgOut->setSquidMaxage( 0 );
+                       $this->mParserOutput = $output;
+                       $wgOut->addParserOutput( $output );
+                       $wgOut->addHTML( "<!-- parser cache is expired, sending anyway due to pool overload-->\n" );
+
+                       return true;
+               } else {
+                       wfDebugLog( 'dirty', "dirty missing\n" );
+                       wfDebug( __METHOD__ . ": no dirty cache\n" );
+
+                       return false;
+               }
+       }
+
+       /**
+        * View redirect
+        *
+        * @param $target Title object or Array of destination(s) to redirect
+        * @param $appendSubtitle Boolean [optional]
+        * @param $forceKnown Boolean: should the image be shown as a bluelink regardless of existence?
+        * @return string containing HMTL with redirect link
+        */
+       public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
+               global $wgOut, $wgContLang, $wgStylePath, $wgUser;
+
+               if ( !is_array( $target ) ) {
+                       $target = array( $target );
+               }
+
+               $imageDir = $wgContLang->getDir();
+
+               if ( $appendSubtitle ) {
+                       $wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) );
+               }
+
+               $sk = $wgUser->getSkin();
+               // the loop prepends the arrow image before the link, so the first case needs to be outside
+               $title = array_shift( $target );
+
+               if ( $forceKnown ) {
+                       $link = $sk->linkKnown( $title, htmlspecialchars( $title->getFullText() ) );
+               } else {
+                       $link = $sk->link( $title, htmlspecialchars( $title->getFullText() ) );
+               }
+
+               $nextRedirect = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png';
+               $alt = $wgContLang->isRTL() ? '←' : '→';
+               // Automatically append redirect=no to each link, since most of them are redirect pages themselves.
+               // FIXME: where this happens?
+               foreach ( $target as $rt ) {
+                       $link .= Html::element( 'img', array( 'src' => $nextRedirect, 'alt' => $alt ) );
+                       if ( $forceKnown ) {
+                               $link .= $sk->linkKnown( $rt, htmlspecialchars( $rt->getFullText() ) );
+                       } else {
+                               $link .= $sk->link( $rt, htmlspecialchars( $rt->getFullText() ) );
+                       }
+               }
+
+               $imageUrl = $wgStylePath . '/common/images/redirect' . $imageDir . '.png';              
+               return '<div class="redirectMsg">' .
+                       Html::element( 'img', array( 'src' => $imageUrl, 'alt' => '#REDIRECT' ) ) .
+                       '<span class="redirectText">' . $link . '</span></div>';
+       }
+
+       /**
+        * Builds trackback links for article display if $wgUseTrackbacks is set to true
+        */
+       public function addTrackbacks() {
                global $wgOut, $wgUser;
 
-               $dbr = wfGetDB(DB_SLAVE);
-               $tbs = $dbr->select(
-                               /* FROM   */ 'trackbacks',
-                               /* SELECT */ array('tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name'),
-                               /* WHERE  */ array('tb_page' => $this->getID())
+               $dbr = wfGetDB( DB_SLAVE );
+               $tbs = $dbr->select( 'trackbacks',
+                       array( 'tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name' ),
+                       array( 'tb_page' => $this->getID() )
                );
 
-               if (!$dbr->numrows($tbs))
+               if ( !$dbr->numRows( $tbs ) ) {
                        return;
+               }
+
+               $wgOut->preventClickjacking();
 
                $tbtext = "";
-               while ($o = $dbr->fetchObject($tbs)) {
+               foreach ( $tbs as $o ) {
                        $rmvtxt = "";
-                       if ($wgUser->isAllowed( 'trackback' )) {
-                               $delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid="
-                                               . $o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) );
+
+                       if ( $wgUser->isAllowed( 'trackback' ) ) {
+                               $delurl = $this->mTitle->getFullURL( "action=deletetrackback&tbid=" .
+                                       $o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) );
                                $rmvtxt = wfMsg( 'trackbackremove', htmlspecialchars( $delurl ) );
                        }
-                       $tbtext .= wfMsg(strlen($o->tb_ex) ? 'trackbackexcerpt' : 'trackback',
+
+                       $tbtext .= "\n";
+                       $tbtext .= wfMsgNoTrans( strlen( $o->tb_ex ) ? 'trackbackexcerpt' : 'trackback',
                                        $o->tb_title,
                                        $o->tb_url,
                                        $o->tb_ex,
                                        $o->tb_name,
-                                       $rmvtxt);
+                                       $rmvtxt );
                }
-               $wgOut->addWikitext(wfMsg('trackbackbox', $tbtext));
+
+               $wgOut->wrapWikiMsg( "<div id='mw_trackbacks'>\n$1\n</div>\n", array( 'trackbackbox', $tbtext ) );
        }
 
-       function deletetrackback() {
-               global $wgUser, $wgRequest, $wgOut, $wgTitle;
+       /**
+        * Removes trackback record for current article from trackbacks table
+        */
+       public function deletetrackback() {
+               global $wgUser, $wgRequest, $wgOut;
 
-               if (!$wgUser->matchEditToken($wgRequest->getVal('token'))) {
-                       $wgOut->addWikitext(wfMsg('sessionfailure'));
-                       return;
-               }
+               if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) {
+                       $wgOut->addWikiMsg( 'sessionfailure' );
 
-               if ((!$wgUser->isAllowed('delete'))) {
-                       $wgOut->permissionRequired( 'delete' );
                        return;
                }
 
-               if (wfReadOnly()) {
-                       $wgOut->readOnlyPage();
+               $permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser );
+
+               if ( count( $permission_errors ) ) {
+                       $wgOut->showPermissionsErrorPage( $permission_errors );
+
                        return;
                }
 
-               $db = wfGetDB(DB_MASTER);
-               $db->delete('trackbacks', array('tb_id' => $wgRequest->getInt('tbid')));
-               $wgTitle->invalidateCache();
-               $wgOut->addWikiText(wfMsg('trackbackdeleteok'));
+               $db = wfGetDB( DB_MASTER );
+               $db->delete( 'trackbacks', array( 'tb_id' => $wgRequest->getInt( 'tbid' ) ) );
+
+               $wgOut->addWikiMsg( 'trackbackdeleteok' );
+               $this->mTitle->invalidateCache();
        }
 
-       function render() {
+       /**
+        * Handle action=render
+        */
+
+       public function render() {
                global $wgOut;
 
-               $wgOut->setArticleBodyOnly(true);
+               $wgOut->setArticleBodyOnly( true );
                $this->view();
        }
 
        /**
         * Handle action=purge
         */
-       function purge() {
+       public function purge() {
                global $wgUser, $wgRequest, $wgOut;
 
                if ( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) {
-                       if( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
+                       //FIXME: shouldn't this be in doPurge()?
+                       if ( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
                                $this->doPurge();
+                               $this->view();
                        }
                } else {
-                       $msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
-                       $action = $this->mTitle->escapeLocalURL( 'action=purge' );
-                       $button = htmlspecialchars( wfMsg( 'confirm_purge_button' ) );
-                       $msg = str_replace( '$1',
-                               "<form method=\"post\" action=\"$action\">\n" .
-                               "<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
-                               "</form>\n", $msg );
+                       $formParams = array(
+                               'method' => 'post',
+                               'action' =>  $wgRequest->getRequestURL(),
+                       );
+
+                       $wgOut->addWikiMsg( 'confirm-purge-top' );
+
+                       $form  = Html::openElement( 'form', $formParams );
+                       $form .= Xml::submitButton( wfMsg( 'confirm_purge_button' ) );
+                       $form .= Html::closeElement( 'form' );
+                       
+                       $wgOut->addHTML( $form );
+                       $wgOut->addWikiMsg( 'confirm-purge-bottom' );
 
                        $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
-                       $wgOut->addHTML( $msg );
+                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
                }
        }
 
        /**
         * Perform the actions of a page purging
         */
-       function doPurge() {
+       public function doPurge() {
                global $wgUseSquid;
+
                // Invalidate the cache
                $this->mTitle->invalidateCache();
 
                if ( $wgUseSquid ) {
                        // Commit the transaction before the purge is sent
                        $dbw = wfGetDB( DB_MASTER );
-                       $dbw->immediateCommit();
+                       $dbw->commit();
 
                        // Send purge
                        $update = SquidUpdate::newSimplePurge( $this->mTitle );
                        $update->doUpdate();
                }
-               $this->view();
+
+               if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+                       global $wgMessageCache;
+
+                       if ( $this->getID() == 0 ) {
+                               $text = false;
+                       } else {
+                               $text = $this->getRawText();
+                       }
+
+                       $wgMessageCache->replace( $this->mTitle->getDBkey(), $text );
+               }
        }
 
        /**
         * Insert a new empty page record for this article.
         * This *must* be followed up by creating a revision
-        * and running $this->updateToLatest( $rev_id );
+        * and running $this->updateRevisionOn( ... );
         * or else the record will be left in a funky state.
         * Best if all done inside a transaction.
         *
-        * @param Database $dbw
-        * @return int     The newly created page_id key
+        * @param $dbw Database
+        * @return int The newly created page_id key, or false if the title already existed
         * @private
         */
-       function insertOn( $dbw ) {
+       public function insertOn( $dbw ) {
                wfProfileIn( __METHOD__ );
 
                $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
@@ -1020,38 +1748,43 @@ class Article {
                        'page_touched'      => $dbw->timestamp(),
                        'page_latest'       => 0, # Fill this in shortly...
                        'page_len'          => 0, # Fill this in shortly...
-               ), __METHOD__ );
-               $newid = $dbw->insertId();
+               ), __METHOD__, 'IGNORE' );
 
-               $this->mTitle->resetArticleId( $newid );
+               $affected = $dbw->affectedRows();
 
+               if ( $affected ) {
+                       $newid = $dbw->insertId();
+                       $this->mTitle->resetArticleId( $newid );
+               }
                wfProfileOut( __METHOD__ );
-               return $newid;
+
+               return $affected ? $newid : false;
        }
 
        /**
         * Update the page record to point to a newly saved revision.
         *
-        * @param Database $dbw
-        * @param Revision $revision For ID number, and text used to set
-                                    length and redirect status fields
-        * @param int $lastRevision If given, will not overwrite the page field
-        *                          when different from the currently set value.
-        *                          Giving 0 indicates the new page flag should
-        *                          be set on.
-        * @param bool $lastRevIsRedirect If given, will optimize adding and
-        *                                                      removing rows in redirect table.
+        * @param $dbw DatabaseBase: object
+        * @param $revision Revision: For ID number, and text used to set
+                           length and redirect status fields
+        * @param $lastRevision Integer: if given, will not overwrite the page field
+        *                      when different from the currently set value.
+        *                      Giving 0 indicates the new page flag should be set
+        *                      on.
+        * @param $lastRevIsRedirect Boolean: if given, will optimize adding and
+        *                           removing rows in redirect table.
         * @return bool true on success, false on failure
         * @private
         */
-       function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null ) {
+       public function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null ) {
                wfProfileIn( __METHOD__ );
 
                $text = $revision->getText();
-               $rt = Title::newFromRedirect( $text );
+               $rt = Title::newFromRedirectRecurse( $text );
 
                $conditions = array( 'page_id' => $this->getId() );
-               if( !is_null( $lastRevision ) ) {
+
+               if ( !is_null( $lastRevision ) ) {
                        # An extra check against threads stepping on each other
                        $conditions['page_latest'] = $lastRevision;
                }
@@ -1060,17 +1793,15 @@ class Article {
                        array( /* SET */
                                'page_latest'      => $revision->getId(),
                                'page_touched'     => $dbw->timestamp(),
-                               'page_is_new'      => ($lastRevision === 0) ? 1 : 0,
-                               'page_is_redirect' => $rt !== NULL ? 1 : 0,
+                               'page_is_new'      => ( $lastRevision === 0 ) ? 1 : 0,
+                               'page_is_redirect' => $rt !== null ? 1 : 0,
                                'page_len'         => strlen( $text ),
                        ),
                        $conditions,
                        __METHOD__ );
 
                $result = $dbw->affectedRows() != 0;
-
-               if ($result) {
-                       // FIXME: Should the result from updateRedirectOn() be returned instead?
+               if ( $result ) {
                        $this->updateRedirectOn( $dbw, $rt, $lastRevIsRedirect );
                }
 
@@ -1081,41 +1812,35 @@ class Article {
        /**
         * Add row to the redirect table if this is a redirect, remove otherwise.
         *
-        * @param Database $dbw
+        * @param $dbw Database
         * @param $redirectTitle a title object pointing to the redirect target,
-        *                                                      or NULL if this is not a redirect
-        * @param bool $lastRevIsRedirect If given, will optimize adding and
-        *                                                      removing rows in redirect table.
+        *                       or NULL if this is not a redirect
+        * @param $lastRevIsRedirect If given, will optimize adding and
+        *                           removing rows in redirect table.
         * @return bool true on success, false on failure
         * @private
         */
-       function updateRedirectOn( &$dbw, $redirectTitle, $lastRevIsRedirect = null ) {
-
+       public function updateRedirectOn( &$dbw, $redirectTitle, $lastRevIsRedirect = null ) {
                // Always update redirects (target link might have changed)
                // Update/Insert if we don't know if the last revision was a redirect or not
                // Delete if changing from redirect to non-redirect
-               $isRedirect = !is_null($redirectTitle);
-               if ($isRedirect || is_null($lastRevIsRedirect) || $lastRevIsRedirect !== $isRedirect) {
+               $isRedirect = !is_null( $redirectTitle );
 
+               if ( $isRedirect || is_null( $lastRevIsRedirect ) || $lastRevIsRedirect !== $isRedirect ) {
                        wfProfileIn( __METHOD__ );
-
-                       if ($isRedirect) {
-
-                               // This title is a redirect, Add/Update row in the redirect table
-                               $set = array( /* SET */
-                                       'rd_namespace' => $redirectTitle->getNamespace(),
-                                       'rd_title'     => $redirectTitle->getDBkey(),
-                                       'rd_from'      => $this->getId(),
-                               );
-
-                               $dbw->replace( 'redirect', array( 'rd_from' ), $set, __METHOD__ );
+                       if ( $isRedirect ) {
+                               $this->insertRedirectEntry( $redirectTitle );
                        } else {
                                // This is not a redirect, remove row from redirect table
                                $where = array( 'rd_from' => $this->getId() );
-                               $dbw->delete( 'redirect', $where, __METHOD__);
+                               $dbw->delete( 'redirect', $where, __METHOD__ );
                        }
 
+                       if ( $this->getTitle()->getNamespace() == NS_FILE ) {
+                               RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() );
+                       }
                        wfProfileOut( __METHOD__ );
+
                        return ( $dbw->affectedRows() != 0 );
                }
 
@@ -1126,10 +1851,11 @@ class Article {
         * If the given revision is newer than the currently set page_latest,
         * update the page record. Otherwise, do nothing.
         *
-        * @param Database $dbw
-        * @param Revision $revision
+        * @param $dbw Database object
+        * @param $revision Revision object
+        * @return mixed
         */
-       function updateIfNewerOn( &$dbw, $revision ) {
+       public function updateIfNewerOn( &$dbw, $revision ) {
                wfProfileIn( __METHOD__ );
 
                $row = $dbw->selectRow(
@@ -1139,8 +1865,9 @@ class Article {
                                'page_id' => $this->getId(),
                                'page_latest=rev_id' ),
                        __METHOD__ );
-               if( $row ) {
-                       if( wfTimestamp(TS_MW, $row->rev_timestamp) >= $revision->getTimestamp() ) {
+
+               if ( $row ) {
+                       if ( wfTimestamp( TS_MW, $row->rev_timestamp ) >= $revision->getTimestamp() ) {
                                wfProfileOut( __METHOD__ );
                                return false;
                        }
@@ -1153,44 +1880,52 @@ class Article {
                }
 
                $ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect );
+
                wfProfileOut( __METHOD__ );
                return $ret;
        }
 
        /**
+        * @param $section empty/null/false or a section number (0, 1, 2, T1, T2...)
+        * @param $text String: new text of the section
+        * @param $summary String: new section's subject, only if $section is 'new'
+        * @param $edittime String: revision timestamp or null to use the current revision
         * @return string Complete article text, or null if error
         */
-       function replaceSection($section, $text, $summary = '', $edittime = NULL) {
+       public function replaceSection( $section, $text, $summary = '', $edittime = null ) {
                wfProfileIn( __METHOD__ );
 
-               if( $section == '' ) {
-                       // Whole-page edit; let the text through unmolested.
+               if ( strval( $section ) == '' ) {
+                       // Whole-page edit; let the whole text through
                } else {
-                       if( is_null( $edittime ) ) {
+                       if ( is_null( $edittime ) ) {
                                $rev = Revision::newFromTitle( $this->mTitle );
                        } else {
                                $dbw = wfGetDB( DB_MASTER );
                                $rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
                        }
-                       if( is_null( $rev ) ) {
+
+                       if ( !$rev ) {
                                wfDebug( "Article::replaceSection asked for bogus section (page: " .
                                        $this->getId() . "; section: $section; edittime: $edittime)\n" );
+                               wfProfileOut( __METHOD__ );
                                return null;
                        }
+
                        $oldtext = $rev->getText();
 
-                       if( $section == 'new' ) {
+                       if ( $section == 'new' ) {
                                # Inserting a new section
-                               $subject = $summary ? wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n" : '';
+                               $subject = $summary ? wfMsgForContent( 'newsectionheaderdefaultlevel', $summary ) . "\n\n" : '';
                                $text = strlen( trim( $oldtext ) ) > 0
                                                ? "{$oldtext}\n\n{$subject}{$text}"
                                                : "{$subject}{$text}";
                        } else {
                                # Replacing an existing section; roll out the big guns
                                global $wgParser;
+
                                $text = $wgParser->replaceSection( $oldtext, $section, $text );
                        }
-
                }
 
                wfProfileOut( __METHOD__ );
@@ -1198,23 +1933,24 @@ class Article {
        }
 
        /**
-        * @deprecated use Article::doEdit()
+        * This function is not deprecated until somebody fixes the core not to use
+        * it. Nevertheless, use Article::doEdit() instead.
         */
-       function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
+       function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC = false, $comment = false, $bot = false ) {
                $flags = EDIT_NEW | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
                        ( $isminor ? EDIT_MINOR : 0 ) |
-                       ( $suppressRC ? EDIT_SUPPRESS_RC : 0 );
+                       ( $suppressRC ? EDIT_SUPPRESS_RC : 0 ) |
+                       ( $bot ? EDIT_FORCE_BOT : 0 );
 
                # If this is a comment, add the summary as headline
                if ( $comment && $summary != "" ) {
-                       $text = wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n".$text;
+                       $text = wfMsgForContent( 'newsectionheaderdefaultlevel', $summary ) . "\n\n" . $text;
                }
-
                $this->doEdit( $text, $summary, $flags );
 
                $dbw = wfGetDB( DB_MASTER );
-               if ($watchthis) {
-                       if (!$this->mTitle->userIsWatching()) {
+               if ( $watchthis ) {
+                       if ( !$this->mTitle->userIsWatching() ) {
                                $dbw->begin();
                                $this->doWatch();
                                $dbw->commit();
@@ -1237,29 +1973,49 @@ class Article {
                        ( $minor ? EDIT_MINOR : 0 ) |
                        ( $forceBot ? EDIT_FORCE_BOT : 0 );
 
-               $good = $this->doEdit( $text, $summary, $flags );
-               if ( $good ) {
-                       $dbw = wfGetDB( DB_MASTER );
-                       if ($watchthis) {
-                               if (!$this->mTitle->userIsWatching()) {
-                                       $dbw->begin();
-                                       $this->doWatch();
-                                       $dbw->commit();
-                               }
-                       } else {
-                               if ( $this->mTitle->userIsWatching() ) {
-                                       $dbw->begin();
-                                       $this->doUnwatch();
-                                       $dbw->commit();
-                               }
+               $status = $this->doEdit( $text, $summary, $flags );
+
+               if ( !$status->isOK() ) {
+                       return false;
+               }
+
+               $dbw = wfGetDB( DB_MASTER );
+               if ( $watchthis ) {
+                       if ( !$this->mTitle->userIsWatching() ) {
+                               $dbw->begin();
+                               $this->doWatch();
+                               $dbw->commit();
+                       }
+               } else {
+                       if ( $this->mTitle->userIsWatching() ) {
+                               $dbw->begin();
+                               $this->doUnwatch();
+                               $dbw->commit();
                        }
+               }
+
+               $extraQuery = ''; // Give extensions a chance to modify URL query on update
+               wfRunHooks( 'ArticleUpdateBeforeRedirect', array( $this, &$sectionanchor, &$extraQuery ) );
 
-                       $extraq = ''; // Give extensions a chance to modify URL query on update
-                       wfRunHooks( 'ArticleUpdateBeforeRedirect', array( $this, &$sectionanchor, &$extraq ) );
+               $this->doRedirect( $this->isRedirect( $text ), $sectionanchor, $extraQuery );
+               return true;
+       }
 
-                       $this->doRedirect( $this->isRedirect( $text ), $sectionanchor, $extraq );
+       /**
+        * Check flags and add EDIT_NEW or EDIT_UPDATE to them as needed.
+        * @param $flags Int
+        * @return Int updated $flags
+        */
+       function checkFlags( $flags ) {
+               if ( !( $flags & EDIT_NEW ) && !( $flags & EDIT_UPDATE ) ) {
+                       if ( $this->mTitle->getArticleID() ) {
+                               $flags |= EDIT_UPDATE;
+                       } else {
+                               $flags |= EDIT_NEW;
+                       }
                }
-               return $good;
+
+               return $flags;
        }
 
        /**
@@ -1270,9 +2026,9 @@ class Article {
         *
         * $wgUser must be set before calling this function.
         *
-        * @param string $text New text
-        * @param string $summary Edit summary
-        * @param integer $flags bitfield:
+        * @param $text String: new text
+        * @param $summary String: edit summary
+        * @param $flags Integer bitfield:
         *      EDIT_NEW
         *          Article is known or assumed to be non-existent, create a new one
         *      EDIT_UPDATE
@@ -1289,114 +2045,161 @@ class Article {
         *          Fill in blank summaries with generated text where possible
         *
         * If neither EDIT_NEW nor EDIT_UPDATE is specified, the status of the article will be detected.
-        * If EDIT_UPDATE is specified and the article doesn't exist, the function will return false. If
-        * EDIT_NEW is specified and the article does exist, a duplicate key error will cause an exception
-        * to be thrown from the Database. These two conditions are also possible with auto-detection due
-        * to MediaWiki's performance-optimised locking strategy.
+        * If EDIT_UPDATE is specified and the article doesn't exist, the function will an
+        * edit-gone-missing error. If EDIT_NEW is specified and the article does exist, an
+        * edit-already-exists error will be returned. These two conditions are also possible with
+        * auto-detection due to MediaWiki's performance-optimised locking strategy.
+        *
+        * @param $baseRevId the revision ID this edit was based off, if any
+        * @param $user Optional user object, $wgUser will be used if not passed
+        *
+        * @return Status object. Possible errors:
+        *     edit-hook-aborted:       The ArticleSave hook aborted the edit but didn't set the fatal flag of $status
+        *     edit-gone-missing:       In update mode, but the article didn't exist
+        *     edit-conflict:           In update mode, the article changed unexpectedly
+        *     edit-no-change:          Warning that the text was the same as before
+        *     edit-already-exists:     In creation mode, but the article already exists
         *
-        * @return bool success
+        *  Extensions may define additional errors.
+        *
+        *  $return->value will contain an associative array with members as follows:
+        *     new:                     Boolean indicating if the function attempted to create a new article
+        *     revision:                The revision object for the inserted revision, or null
+        *
+        *  Compatibility note: this function previously returned a boolean value indicating success/failure
         */
-       function doEdit( $text, $summary, $flags = 0 ) {
-               global $wgUser, $wgDBtransactions;
+       public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
+               global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries;
+
+               # Low-level sanity check
+               if ( $this->mTitle->getText() === '' ) {
+                       throw new MWException( 'Something is trying to edit an article with an empty title' );
+               }
 
                wfProfileIn( __METHOD__ );
-               $good = true;
 
-               if ( !($flags & EDIT_NEW) && !($flags & EDIT_UPDATE) ) {
-                       $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
-                       if ( $aid ) {
-                               $flags |= EDIT_UPDATE;
-                       } else {
-                               $flags |= EDIT_NEW;
-                       }
-               }
+               $user = is_null( $user ) ? $wgUser : $user;
+               $status = Status::newGood( array() );
+
+               # Load $this->mTitle->getArticleID() and $this->mLatest if it's not already
+               $this->loadPageData();
 
-               if( !wfRunHooks( 'ArticleSave', array( &$this, &$wgUser, &$text,
-                       &$summary, $flags & EDIT_MINOR,
-                       null, null, &$flags ) ) )
+               $flags = $this->checkFlags( $flags );
+
+               if ( !wfRunHooks( 'ArticleSave', array( &$this, &$user, &$text, &$summary,
+                       $flags & EDIT_MINOR, null, null, &$flags, &$status ) ) )
                {
                        wfDebug( __METHOD__ . ": ArticleSave hook aborted save!\n" );
+
+                       if ( $status->isOK() ) {
+                               $status->fatal( 'edit-hook-aborted' );
+                       }
+
                        wfProfileOut( __METHOD__ );
-                       return false;
+                       return $status;
                }
 
                # Silently ignore EDIT_MINOR if not allowed
-               $isminor = ( $flags & EDIT_MINOR ) && $wgUser->isAllowed('minoredit');
-               $bot = $wgUser->isAllowed( 'bot' ) || ( $flags & EDIT_FORCE_BOT );
+               $isminor = ( $flags & EDIT_MINOR ) && $user->isAllowed( 'minoredit' );
+               $bot = $flags & EDIT_FORCE_BOT;
 
-               $oldtext = $this->getContent();
+               $oldtext = $this->getRawText(); // current revision
                $oldsize = strlen( $oldtext );
 
-               # Provide autosummaries if one is not provided.
-               if ($flags & EDIT_AUTOSUMMARY && $summary == '')
+               # Provide autosummaries if one is not provided and autosummaries are enabled.
+               if ( $wgUseAutomaticEditSummaries && $flags & EDIT_AUTOSUMMARY && $summary == '' ) {
                        $summary = $this->getAutosummary( $oldtext, $text, $flags );
+               }
 
-               $text = $this->preSaveTransform( $text );
+               $editInfo = $this->prepareTextForEdit( $text );
+               $text = $editInfo->pst;
                $newsize = strlen( $text );
 
                $dbw = wfGetDB( DB_MASTER );
                $now = wfTimestampNow();
+               $this->mTimestamp = $now;
 
                if ( $flags & EDIT_UPDATE ) {
                        # Update article, but only if changed.
+                       $status->value['new'] = false;
 
                        # Make sure the revision is either completely inserted or not inserted at all
-                       if( !$wgDBtransactions ) {
+                       if ( !$wgDBtransactions ) {
                                $userAbort = ignore_user_abort( true );
                        }
 
-                       $lastRevision = 0;
-                       $revisionId = 0;
+                       $changed = ( strcmp( $text, $oldtext ) != 0 );
 
-                       if ( 0 != strcmp( $text, $oldtext ) ) {
+                       if ( $changed ) {
                                $this->mGoodAdjustment = (int)$this->isCountable( $text )
                                  - (int)$this->isCountable( $oldtext );
                                $this->mTotalAdjustment = 0;
 
-                               $lastRevision = $dbw->selectField(
-                                       'page', 'page_latest', array( 'page_id' => $this->getId() ) );
-
-                               if ( !$lastRevision ) {
+                               if ( !$this->mLatest ) {
                                        # Article gone missing
-                                       wfDebug( __METHOD__.": EDIT_UPDATE specified but article doesn't exist\n" );
+                                       wfDebug( __METHOD__ . ": EDIT_UPDATE specified but article doesn't exist\n" );
+                                       $status->fatal( 'edit-gone-missing' );
+
                                        wfProfileOut( __METHOD__ );
-                                       return false;
+                                       return $status;
                                }
 
                                $revision = new Revision( array(
                                        'page'       => $this->getId(),
                                        'comment'    => $summary,
                                        'minor_edit' => $isminor,
-                                       'text'       => $text
-                                       ) );
+                                       'text'       => $text,
+                                       'parent_id'  => $this->mLatest,
+                                       'user'       => $user->getId(),
+                                       'user_text'  => $user->getName(),
+                               ) );
 
                                $dbw->begin();
                                $revisionId = $revision->insertOn( $dbw );
 
                                # Update page
-                               $ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision );
-
-                               if( !$ok ) {
+                               #
+                               # Note that we use $this->mLatest instead of fetching a value from the master DB
+                               # during the course of this function. This makes sure that EditPage can detect
+                               # edit conflicts reliably, either by $ok here, or by $article->getTimestamp()
+                               # before this function is called. A previous function used a separate query, this
+                               # creates a window where concurrent edits can cause an ignored edit conflict.
+                               $ok = $this->updateRevisionOn( $dbw, $revision, $this->mLatest );
+
+                               if ( !$ok ) {
                                        /* Belated edit conflict! Run away!! */
-                                       $good = false;
+                                       $status->fatal( 'edit-conflict' );
+
+                                       # Delete the invalid revision if the DB is not transactional
+                                       if ( !$wgDBtransactions ) {
+                                               $dbw->delete( 'revision', array( 'rev_id' => $revisionId ), __METHOD__ );
+                                       }
+
+                                       $revisionId = 0;
                                        $dbw->rollback();
                                } else {
+                                       global $wgUseRCPatrol;
+                                       wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, $baseRevId, $user ) );
                                        # Update recentchanges
-                                       if( !( $flags & EDIT_SUPPRESS_RC ) ) {
-                                               $rcid = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
-                                                       $lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
-                                                       $revisionId );
-
+                                       if ( !( $flags & EDIT_SUPPRESS_RC ) ) {
                                                # Mark as patrolled if the user can do so
-                                               if( $GLOBALS['wgUseRCPatrol'] && $wgUser->isAllowed( 'autopatrol' ) ) {
-                                                       RecentChange::markPatrolled( $rcid );
-                                                       PatrolLog::record( $rcid, true );
+                                               $patrolled = $wgUseRCPatrol && $this->mTitle->userCan( 'autopatrol' );
+                                               # Add RC row to the DB
+                                               $rc = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $user, $summary,
+                                                       $this->mLatest, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
+                                                       $revisionId, $patrolled
+                                               );
+
+                                               # Log auto-patrolled edits
+                                               if ( $patrolled ) {
+                                                       PatrolLog::record( $rc, true );
                                                }
                                        }
-                                       $wgUser->incEditCount();
+                                       $user->incEditCount();
                                        $dbw->commit();
                                }
                        } else {
+                               $status->warning( 'edit-no-change' );
                                $revision = null;
                                // Keep the same revision ID, but do some updates on it
                                $revisionId = $this->getRevIdFetched();
@@ -1405,21 +2208,24 @@ class Article {
                                $this->mTitle->invalidateCache();
                        }
 
-                       if( !$wgDBtransactions ) {
+                       if ( !$wgDBtransactions ) {
                                ignore_user_abort( $userAbort );
                        }
 
-                       if ( $good ) {
-                               # Invalidate cache of this article and all pages using this article
-                               # as a template. Partly deferred.
-                               Article::onArticleEdit( $this->mTitle );
-
-                               # Update links tables, site stats, etc.
-                               $changed = ( strcmp( $oldtext, $text ) != 0 );
-                               $this->editUpdates( $text, $summary, $isminor, $now, $revisionId, $changed );
+                       // Now that ignore_user_abort is restored, we can respond to fatal errors
+                       if ( !$status->isOK() ) {
+                               wfProfileOut( __METHOD__ );
+                               return $status;
                        }
+
+                       # Invalidate cache of this article and all pages using this article
+                       # as a template. Partly deferred.
+                       Article::onArticleEdit( $this->mTitle );
+                       # Update links tables, site stats, etc.
+                       $this->editUpdates( $text, $summary, $isminor, $now, $revisionId, $changed );
                } else {
                        # Create new article
+                       $status->value['new'] = true;
 
                        # Set statistics members
                        # We work out if it's countable after PST to avoid counter drift
@@ -1430,15 +2236,25 @@ class Article {
                        $dbw->begin();
 
                        # Add the page record; stake our claim on this title!
-                       # This will fail with a database query exception if the article already exists
+                       # This will return false if the article already exists
                        $newid = $this->insertOn( $dbw );
 
+                       if ( $newid === false ) {
+                               $dbw->rollback();
+                               $status->fatal( 'edit-already-exists' );
+
+                               wfProfileOut( __METHOD__ );
+                               return $status;
+                       }
+
                        # Save the revision text...
                        $revision = new Revision( array(
                                'page'       => $newid,
                                'comment'    => $summary,
                                'minor_edit' => $isminor,
-                               'text'       => $text
+                               'text'       => $text,
+                               'user'       => $user->getId(),
+                               'user_text'  => $user->getName(),
                                ) );
                        $revisionId = $revision->insertOn( $dbw );
 
@@ -1447,16 +2263,24 @@ class Article {
                        # Update the page record with revision data
                        $this->updateRevisionOn( $dbw, $revision, 0 );
 
-                       if( !( $flags & EDIT_SUPPRESS_RC ) ) {
-                               $rcid = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, $bot,
-                                 '', strlen( $text ), $revisionId );
-                               # Mark as patrolled if the user can
-                               if( $GLOBALS['wgUseRCPatrol'] && $wgUser->isAllowed( 'autopatrol' ) ) {
-                                       RecentChange::markPatrolled( $rcid );
-                                       PatrolLog::record( $rcid, true );
+                       wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $user ) );
+
+                       # Update recentchanges
+                       if ( !( $flags & EDIT_SUPPRESS_RC ) ) {
+                               global $wgUseRCPatrol, $wgUseNPPatrol;
+
+                               # Mark as patrolled if the user can do so
+                               $patrolled = ( $wgUseRCPatrol || $wgUseNPPatrol ) && $this->mTitle->userCan( 'autopatrol' );
+                               # Add RC row to the DB
+                               $rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot,
+                                       '', strlen( $text ), $revisionId, $patrolled );
+
+                               # Log auto-patrolled edits
+                               if ( $patrolled ) {
+                                       PatrolLog::record( $rc, true );
                                }
                        }
-                       $wgUser->incEditCount();
+                       $user->incEditCount();
                        $dbw->commit();
 
                        # Update links, etc.
@@ -1465,27 +2289,30 @@ class Article {
                        # Clear caches
                        Article::onArticleCreate( $this->mTitle );
 
-                       wfRunHooks( 'ArticleInsertComplete', array( &$this, &$wgUser, $text, $summary,
-                        $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
+                       wfRunHooks( 'ArticleInsertComplete', array( &$this, &$user, $text, $summary,
+                               $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
                }
 
-               if ( $good && !( $flags & EDIT_DEFER_UPDATES ) ) {
+               # Do updates right now unless deferral was requested
+               if ( !( $flags & EDIT_DEFER_UPDATES ) ) {
                        wfDoUpdates();
                }
 
-               if ( $good ) {
-                       wfRunHooks( 'ArticleSaveComplete', array( &$this, &$wgUser, $text, $summary,
-                               $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
-               }
+               // Return the new revision (or null) to the caller
+               $status->value['revision'] = $revision;
+
+               wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $text, $summary,
+                       $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ) );
 
                wfProfileOut( __METHOD__ );
-               return $good;
+               return $status;
        }
 
        /**
         * @deprecated wrapper for doRedirect
         */
-       function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
+       public function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
+               wfDeprecated( __METHOD__ );
                $this->doRedirect( $this->isRedirect( $text ), $sectionanchor );
        }
 
@@ -1493,106 +2320,104 @@ class Article {
         * Output a redirect back to the article.
         * This is typically used after an edit.
         *
-        * @param boolean $noRedir Add redirect=no
-        * @param string $sectionAnchor section to redirect to, including "#"
+        * @param $noRedir Boolean: add redirect=no
+        * @param $sectionAnchor String: section to redirect to, including "#"
+        * @param $extraQuery String: extra query params
         */
-       function doRedirect( $noRedir = false, $sectionAnchor = '', $extraq = '' ) {
+       public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
                global $wgOut;
+
                if ( $noRedir ) {
                        $query = 'redirect=no';
-                       if( $extraq )
-                               $query .= "&$query";
+                       if ( $extraQuery )
+                               $query .= "&$extraQuery";
                } else {
-                       $query = $extraq;
+                       $query = $extraQuery;
                }
+
                $wgOut->redirect( $this->mTitle->getFullURL( $query ) . $sectionAnchor );
        }
 
        /**
-        * Mark this particular edit as patrolled
+        * Mark this particular edit/page as patrolled
         */
-       function markpatrolled() {
-               global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUser;
+       public function markpatrolled() {
+               global $wgOut, $wgUser, $wgRequest;
+
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
 
-               # Check RC patrol config. option
-               if( !$wgUseRCPatrol ) {
-                       $wgOut->errorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
+               # If we haven't been given an rc_id value, we can't do anything
+               $rcid = (int) $wgRequest->getVal( 'rcid' );
+
+               if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ), $rcid ) ) {
+                       $wgOut->showErrorPage( 'sessionfailure-title', 'sessionfailure' );
                        return;
                }
 
-               # Check permissions
-               if( !$wgUser->isAllowed( 'patrol' ) ) {
-                       $wgOut->permissionRequired( 'patrol' );
+               $rc = RecentChange::newFromId( $rcid );
+
+               if ( is_null( $rc ) ) {
+                       $wgOut->showErrorPage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
                        return;
                }
 
-               # If we haven't been given an rc_id value, we can't do anything
-               $rcid = $wgRequest->getVal( 'rcid' );
-               if( !$rcid ) {
-                       $wgOut->errorPage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
+               # It would be nice to see where the user had actually come from, but for now just guess
+               $returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges';
+               $return = SpecialPage::getTitleFor( $returnto );
+
+               $errors = $rc->doMarkPatrolled();
+
+               if ( in_array( array( 'rcpatroldisabled' ), $errors ) ) {
+                       $wgOut->showErrorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
+
                        return;
                }
 
-               # Handle the 'MarkPatrolled' hook
-               if( !wfRunHooks( 'MarkPatrolled', array( $rcid, &$wgUser, false ) ) ) {
+               if ( in_array( array( 'hookaborted' ), $errors ) ) {
+                       // The hook itself has handled any output
                        return;
                }
 
-               $return = SpecialPage::getTitleFor( 'Recentchanges' );
-               # If it's left up to us, check that the user is allowed to patrol this edit
-               # If the user has the "autopatrol" right, then we'll assume there are no
-               # other conditions stopping them doing so
-               if( !$wgUser->isAllowed( 'autopatrol' ) ) {
-                       $rc = RecentChange::newFromId( $rcid );
-                       # Graceful error handling, as we've done before here...
-                       # (If the recent change doesn't exist, then it doesn't matter whether
-                       # the user is allowed to patrol it or not; nothing is going to happen
-                       if( is_object( $rc ) && $wgUser->getName() == $rc->getAttribute( 'rc_user_text' ) ) {
-                               # The user made this edit, and can't patrol it
-                               # Tell them so, and then back off
-                               $wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) );
-                               $wgOut->addWikiText( wfMsgNoTrans( 'markedaspatrollederror-noautopatrol' ) );
-                               $wgOut->returnToMain( false, $return );
-                               return;
-                       }
+               if ( in_array( array( 'markedaspatrollederror-noautopatrol' ), $errors ) ) {
+                       $wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) );
+                       $wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
+                       $wgOut->returnToMain( false, $return );
+
+                       return;
                }
 
-               # Mark the edit as patrolled
-               RecentChange::markPatrolled( $rcid );
-               PatrolLog::record( $rcid );
-               wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, false ) );
+               if ( !empty( $errors ) ) {
+                       $wgOut->showPermissionsErrorPage( $errors );
+
+                       return;
+               }
 
                # Inform the user
                $wgOut->setPageTitle( wfMsg( 'markedaspatrolled' ) );
-               $wgOut->addWikiText( wfMsgNoTrans( 'markedaspatrolledtext' ) );
+               $wgOut->addWikiMsg( 'markedaspatrolledtext', $rc->getTitle()->getPrefixedText() );
                $wgOut->returnToMain( false, $return );
        }
 
        /**
         * User-interface handler for the "watch" action
         */
-
-       function watch() {
-
+       public function watch() {
                global $wgUser, $wgOut;
 
                if ( $wgUser->isAnon() ) {
                        $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
                        return;
                }
+
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
                        return;
                }
 
-               if( $this->doWatch() ) {
+               if ( $this->doWatch() ) {
                        $wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
-                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
-
-                       $link = wfEscapeWikiText( $this->mTitle->getPrefixedText() );
-                       $text = wfMsg( 'addedwatchtext', $link );
-                       $wgOut->addWikiText( $text );
+                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
+                       $wgOut->addWikiMsg( 'addedwatchtext', $this->mTitle->getPrefixedText() );
                }
 
                $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
@@ -1600,18 +2425,21 @@ class Article {
 
        /**
         * Add this page to $wgUser's watchlist
+        *
+        * This is safe to be called multiple times
+        *
         * @return bool true on successful watch operation
         */
-       function doWatch() {
+       public function doWatch() {
                global $wgUser;
-               if( $wgUser->isAnon() ) {
+
+               if ( $wgUser->isAnon() ) {
                        return false;
                }
 
-               if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
+               if ( wfRunHooks( 'WatchArticle', array( &$wgUser, &$this ) ) ) {
                        $wgUser->addWatch( $this->mTitle );
-
-                       return wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this));
+                       return wfRunHooks( 'WatchArticleComplete', array( &$wgUser, &$this ) );
                }
 
                return false;
@@ -1620,26 +2448,23 @@ class Article {
        /**
         * User interface handler for the "unwatch" action.
         */
-       function unwatch() {
-
+       public function unwatch() {
                global $wgUser, $wgOut;
 
                if ( $wgUser->isAnon() ) {
                        $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
                        return;
                }
+
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
                        return;
                }
 
-               if( $this->doUnwatch() ) {
+               if ( $this->doUnwatch() ) {
                        $wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
-                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
-
-                       $link = wfEscapeWikiText( $this->mTitle->getPrefixedText() );
-                       $text = wfMsg( 'removedwatchtext', $link );
-                       $wgOut->addWikiText( $text );
+                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
+                       $wgOut->addWikiMsg( 'removedwatchtext', $this->mTitle->getPrefixedText() );
                }
 
                $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
@@ -1649,16 +2474,16 @@ class Article {
         * Stop watching a page
         * @return bool true on successful unwatch
         */
-       function doUnwatch() {
+       public function doUnwatch() {
                global $wgUser;
-               if( $wgUser->isAnon() ) {
+
+               if ( $wgUser->isAnon() ) {
                        return false;
                }
 
-               if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
+               if ( wfRunHooks( 'UnwatchArticle', array( &$wgUser, &$this ) ) ) {
                        $wgUser->removeWatch( $this->mTitle );
-
-                       return wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
+                       return wfRunHooks( 'UnwatchArticleComplete', array( &$wgUser, &$this ) );
                }
 
                return false;
@@ -1667,7 +2492,7 @@ class Article {
        /**
         * action=protect handler
         */
-       function protect() {
+       public function protect() {
                $form = new ProtectionForm( $this );
                $form->execute();
        }
@@ -1675,26 +2500,42 @@ class Article {
        /**
         * action=unprotect handler (alias)
         */
-       function unprotect() {
+       public function unprotect() {
                $this->protect();
        }
 
        /**
         * Update the article's restriction field, and leave a log entry.
         *
-        * @param array $limit set of restriction keys
-        * @param string $reason
+        * @param $limit Array: set of restriction keys
+        * @param $reason String
+        * @param &$cascade Integer. Set to false if cascading protection isn't allowed.
+        * @param $expiry Array: per restriction type expiration
         * @return bool true on success
         */
-       function updateRestrictions( $limit = array(), $reason = '', $cascade = 0, $expiry = null ) {
-               global $wgUser, $wgRestrictionTypes, $wgContLang;
+       public function updateRestrictions( $limit = array(), $reason = '', &$cascade = 0, $expiry = array() ) {
+               global $wgUser, $wgContLang;
+
+               $restrictionTypes = $this->mTitle->getRestrictionTypes();
 
                $id = $this->mTitle->getArticleID();
-               if( !$wgUser->isAllowed( 'protect' ) || wfReadOnly() || $id == 0 ) {
+
+               if ( $id <= 0 ) {
+                       wfDebug( "updateRestrictions failed: article id $id <= 0\n" );
                        return false;
                }
 
-               if (!$cascade) {
+               if ( wfReadOnly() ) {
+                       wfDebug( "updateRestrictions failed: read-only\n" );
+                       return false;
+               }
+
+               if ( !$this->mTitle->userCan( 'protect' ) ) {
+                       wfDebug( "updateRestrictions failed: insufficient permissions\n" );
+                       return false;
+               }
+
+               if ( !$cascade ) {
                        $cascade = false;
                }
 
@@ -1704,76 +2545,122 @@ class Article {
                # FIXME: Same limitations as described in ProtectionForm.php (line 37);
                # we expect a single selection, but the schema allows otherwise.
                $current = array();
-               foreach( $wgRestrictionTypes as $action )
-                       $current[$action] = implode( '', $this->mTitle->getRestrictions( $action ) );
+               $updated = Article::flattenRestrictions( $limit );
+               $changed = false;
+
+               foreach ( $restrictionTypes as $action ) {
+                       if ( isset( $expiry[$action] ) ) {
+                               # Get current restrictions on $action
+                               $aLimits = $this->mTitle->getRestrictions( $action );
+                               $current[$action] = implode( '', $aLimits );
+                               # Are any actual restrictions being dealt with here?
+                               $aRChanged = count( $aLimits ) || !empty( $limit[$action] );
+
+                               # If something changed, we need to log it. Checking $aRChanged
+                               # assures that "unprotecting" a page that is not protected does
+                               # not log just because the expiry was "changed".
+                               if ( $aRChanged && $this->mTitle->mRestrictionsExpiry[$action] != $expiry[$action] ) {
+                                       $changed = true;
+                               }
+                       }
+               }
 
                $current = Article::flattenRestrictions( $current );
-               $updated = Article::flattenRestrictions( $limit );
 
-               $changed = ( $current != $updated );
-               $changed = $changed || ($this->mTitle->areRestrictionsCascading() != $cascade);
-               $changed = $changed || ($this->mTitle->mRestrictionsExpiry != $expiry);
+               $changed = ( $changed || $current != $updated );
+               $changed = $changed || ( $updated && $this->mTitle->areRestrictionsCascading() != $cascade );
                $protect = ( $updated != '' );
 
                # If nothing's changed, do nothing
-               if( $changed ) {
-                       global $wgGroupPermissions;
-                       if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) {
-
+               if ( $changed ) {
+                       if ( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) {
                                $dbw = wfGetDB( DB_MASTER );
 
-                               $encodedExpiry = Block::encodeExpiry($expiry, $dbw );
-
-                               $expiry_description = '';
-                               if ( $encodedExpiry != 'infinity' ) {
-                                       $expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) ).')';
-                               }
-
                                # Prepare a null revision to be added to the history
                                $modified = $current != '' && $protect;
+
                                if ( $protect ) {
                                        $comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle';
                                } else {
                                        $comment_type = 'unprotectedarticle';
                                }
+
                                $comment = $wgContLang->ucfirst( wfMsgForContent( $comment_type, $this->mTitle->getPrefixedText() ) );
 
-                               foreach( $limit as $action => $restrictions ) {
-                                       # Check if the group level required to edit also can protect pages
-                                       # Otherwise, people who cannot normally protect can "protect" pages via transclusion
-                                       $cascade = ( $cascade && isset($wgGroupPermissions[$restrictions]['protect']) && $wgGroupPermissions[$restrictions]['protect'] );       
+                               # Only restrictions with the 'protect' right can cascade...
+                               # Otherwise, people who cannot normally protect can "protect" pages via transclusion
+                               $editrestriction = isset( $limit['edit'] ) ? array( $limit['edit'] ) : $this->mTitle->getRestrictions( 'edit' );
+
+                               # The schema allows multiple restrictions
+                               if ( !in_array( 'protect', $editrestriction ) && !in_array( 'sysop', $editrestriction ) ) {
+                                       $cascade = false;
+                               }
+
+                               $cascade_description = '';
+
+                               if ( $cascade ) {
+                                       $cascade_description = ' [' . wfMsgForContent( 'protect-summary-cascade' ) . ']';
+                               }
+
+                               if ( $reason ) {
+                                       $comment .= ": $reason";
+                               }
+
+                               $editComment = $comment;
+                               $encodedExpiry = array();
+                               $protect_description = '';
+                               foreach ( $limit as $action => $restrictions ) {
+                                       if ( !isset( $expiry[$action] ) )
+                                               $expiry[$action] = Block::infinity();
+
+                                       $encodedExpiry[$action] = Block::encodeExpiry( $expiry[$action], $dbw );
+                                       if ( $restrictions != '' ) {
+                                               $protect_description .= "[$action=$restrictions] (";
+                                               if ( $encodedExpiry[$action] != 'infinity' ) {
+                                                       $protect_description .= wfMsgForContent( 'protect-expiring',
+                                                               $wgContLang->timeanddate( $expiry[$action], false, false ) ,
+                                                               $wgContLang->date( $expiry[$action], false, false ) ,
+                                                               $wgContLang->time( $expiry[$action], false, false ) );
+                                               } else {
+                                                       $protect_description .= wfMsgForContent( 'protect-expiry-indefinite' );
+                                               }
+
+                                               $protect_description .= ') ';
+                                       }
                                }
-                               
-                               $cascade_description = '';
-                               if ($cascade) {
-                                       $cascade_description = ' ['.wfMsg('protect-summary-cascade').']';
+                               $protect_description = trim( $protect_description );
+
+                               if ( $protect_description && $protect ) {
+                                       $editComment .= " ($protect_description)";
                                }
 
-                               if( $reason )
-                                       $comment .= ": $reason";
-                               if( $protect )
-                                       $comment .= " [$updated]";
-                               if ( $expiry_description && $protect )
-                                       $comment .= "$expiry_description";
-                               if ( $cascade )
-                                       $comment .= "$cascade_description";
-
-                               $nullRevision = Revision::newNullRevision( $dbw, $id, $comment, true );
-                               $nullRevId = $nullRevision->insertOn( $dbw );
+                               if ( $cascade ) {
+                                       $editComment .= "$cascade_description";
+                               }
 
                                # Update restrictions table
-                               foreach( $limit as $action => $restrictions ) {
-                                       if ($restrictions != '' ) {
-                                               $dbw->replace( 'page_restrictions', array(array('pr_page', 'pr_type')),
-                                                       array( 'pr_page' => $id, 'pr_type' => $action
-                                                               , 'pr_level' => $restrictions, 'pr_cascade' => $cascade ? 1 : 0
-                                                               , 'pr_expiry' => $encodedExpiry ), __METHOD__  );
+                               foreach ( $limit as $action => $restrictions ) {
+                                       if ( $restrictions != '' ) {
+                                               $dbw->replace( 'page_restrictions', array( array( 'pr_page', 'pr_type' ) ),
+                                                       array( 'pr_page' => $id,
+                                                               'pr_type' => $action,
+                                                               'pr_level' => $restrictions,
+                                                               'pr_cascade' => ( $cascade && $action == 'edit' ) ? 1 : 0,
+                                                               'pr_expiry' => $encodedExpiry[$action]
+                                                       ),
+                                                       __METHOD__
+                                               );
                                        } else {
                                                $dbw->delete( 'page_restrictions', array( 'pr_page' => $id,
                                                        'pr_type' => $action ), __METHOD__ );
                                        }
                                }
 
+                               # Insert a null revision
+                               $nullRevision = Revision::newNullRevision( $dbw, $id, $editComment, true );
+                               $nullRevId = $nullRevision->insertOn( $dbw );
+
+                               $latest = $this->getLatest();
                                # Update page record
                                $dbw->update( 'page',
                                        array( /* SET */
@@ -1784,17 +2671,18 @@ class Article {
                                                'page_id' => $id
                                        ), 'Article::protect'
                                );
+
+                               wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $nullRevision, $latest, $wgUser ) );
                                wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser, $limit, $reason ) );
 
                                # Update the protection log
                                $log = new LogPage( 'protect' );
-
-                               if( $protect ) {
-                                       $log->addEntry( $modified ? 'modify' : 'protect', $this->mTitle, trim( $reason . " [$updated]$cascade_description$expiry_description" ) );
+                               if ( $protect ) {
+                                       $params = array( $protect_description, $cascade ? 'cascade' : '' );
+                                       $log->addEntry( $modified ? 'modify' : 'protect', $this->mTitle, trim( $reason ), $params );
                                } else {
                                        $log->addEntry( 'unprotect', $this->mTitle, $reason );
                                }
-
                        } # End hook
                } # End "changed" check
 
@@ -1804,157 +2692,280 @@ class Article {
        /**
         * Take an array of page restrictions and flatten it to a string
         * suitable for insertion into the page_restrictions field.
-        * @param array $limit
-        * @return string
-        * @private
+        * @param $limit Array
+        * @return String
         */
-       function flattenRestrictions( $limit ) {
-               if( !is_array( $limit ) ) {
+       protected static function flattenRestrictions( $limit ) {
+               if ( !is_array( $limit ) ) {
                        throw new MWException( 'Article::flattenRestrictions given non-array restriction set' );
                }
+
                $bits = array();
                ksort( $limit );
-               foreach( $limit as $action => $restrictions ) {
-                       if( $restrictions != '' ) {
+
+               foreach ( $limit as $action => $restrictions ) {
+                       if ( $restrictions != '' ) {
                                $bits[] = "$action=$restrictions";
                        }
                }
+
                return implode( ':', $bits );
        }
 
+       /**
+        * Auto-generates a deletion reason
+        *
+        * @param &$hasHistory Boolean: whether the page has a history
+        * @return mixed String containing deletion reason or empty string, or boolean false
+        *    if no revision occurred
+        */
+       public function generateReason( &$hasHistory ) {
+               global $wgContLang;
+
+               $dbw = wfGetDB( DB_MASTER );
+               // Get the last revision
+               $rev = Revision::newFromTitle( $this->mTitle );
+
+               if ( is_null( $rev ) ) {
+                       return false;
+               }
+
+               // Get the article's contents
+               $contents = $rev->getText();
+               $blank = false;
+
+               // If the page is blank, use the text from the previous revision,
+               // which can only be blank if there's a move/import/protect dummy revision involved
+               if ( $contents == '' ) {
+                       $prev = $rev->getPrevious();
+
+                       if ( $prev )    {
+                               $contents = $prev->getText();
+                               $blank = true;
+                       }
+               }
+
+               // Find out if there was only one contributor
+               // Only scan the last 20 revisions
+               $res = $dbw->select( 'revision', 'rev_user_text',
+                       array( 'rev_page' => $this->getID(), $dbw->bitAnd( 'rev_deleted', Revision::DELETED_USER ) . ' = 0' ),
+                       __METHOD__,
+                       array( 'LIMIT' => 20 )
+               );
+
+               if ( $res === false ) {
+                       // This page has no revisions, which is very weird
+                       return false;
+               }
+
+               $hasHistory = ( $res->numRows() > 1 );
+               $row = $dbw->fetchObject( $res );
+
+               if ( $row ) { // $row is false if the only contributor is hidden
+                       $onlyAuthor = $row->rev_user_text;
+                       // Try to find a second contributor
+                       foreach ( $res as $row ) {
+                               if ( $row->rev_user_text != $onlyAuthor ) { // Bug 22999
+                                       $onlyAuthor = false;
+                                       break;
+                               }
+                       }
+               } else {
+                       $onlyAuthor = false;
+               }
+
+               // Generate the summary with a '$1' placeholder
+               if ( $blank ) {
+                       // The current revision is blank and the one before is also
+                       // blank. It's just not our lucky day
+                       $reason = wfMsgForContent( 'exbeforeblank', '$1' );
+               } else {
+                       if ( $onlyAuthor ) {
+                               $reason = wfMsgForContent( 'excontentauthor', '$1', $onlyAuthor );
+                       } else {
+                               $reason = wfMsgForContent( 'excontent', '$1' );
+                       }
+               }
+
+               if ( $reason == '-' ) {
+                       // Allow these UI messages to be blanked out cleanly
+                       return '';
+               }
+
+               // Replace newlines with spaces to prevent uglyness
+               $contents = preg_replace( "/[\n\r]/", ' ', $contents );
+               // Calculate the maximum amount of chars to get
+               // Max content length = max comment length - length of the comment (excl. $1) - '...'
+               $maxLength = 255 - ( strlen( $reason ) - 2 ) - 3;
+               $contents = $wgContLang->truncate( $contents, $maxLength );
+               // Remove possible unfinished links
+               $contents = preg_replace( '/\[\[([^\]]*)\]?$/', '$1', $contents );
+               // Now replace the '$1' placeholder
+               $reason = str_replace( '$1', $contents, $reason );
+
+               return $reason;
+       }
+
+
        /*
         * UI entry point for page deletion
         */
-       function delete() {
+       public function delete() {
                global $wgUser, $wgOut, $wgRequest;
+
                $confirm = $wgRequest->wasPosted() &&
-                       $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
-               $reason = $wgRequest->getText( 'wpReason' );
+                               $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
+
+               $this->DeleteReasonList = $wgRequest->getText( 'wpDeleteReasonList', 'other' );
+               $this->DeleteReason = $wgRequest->getText( 'wpReason' );
+
+               $reason = $this->DeleteReasonList;
+
+               if ( $reason != 'other' && $this->DeleteReason != '' ) {
+                       // Entry from drop down menu + additional comment
+                       $reason .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason;
+               } elseif ( $reason == 'other' ) {
+                       $reason = $this->DeleteReason;
+               }
+
+               # Flag to hide all contents of the archived revisions
+               $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed( 'suppressrevision' );
 
                # This code desperately needs to be totally rewritten
 
-               # Check permissions
-               if( $wgUser->isAllowed( 'delete' ) ) {
-                       if( $wgUser->isBlocked( !$confirm ) ) {
-                               $wgOut->blockedPage();
-                               return;
-                       }
-               } else {
-                       $wgOut->permissionRequired( 'delete' );
+               # Read-only check...
+               if ( wfReadOnly() ) {
+                       $wgOut->readOnlyPage();
+
                        return;
                }
 
-               if( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
+               # Check permissions
+               $permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser );
+
+               if ( count( $permission_errors ) > 0 ) {
+                       $wgOut->showPermissionsErrorPage( $permission_errors );
+
                        return;
                }
 
-               $wgOut->setPagetitle( wfMsg( 'confirmdelete' ) );
+               $wgOut->setPagetitle( wfMsg( 'delete-confirm', $this->mTitle->getPrefixedText() ) );
 
                # Better double-check that it hasn't been deleted yet!
                $dbw = wfGetDB( DB_MASTER );
                $conds = $this->mTitle->pageCond();
                $latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
                if ( $latest === false ) {
-                       $wgOut->showFatalError( wfMsg( 'cannotdelete' ) );
+                       $wgOut->showFatalError(
+                               Html::rawElement(
+                                       'div',
+                                       array( 'class' => 'error mw-error-cannotdelete' ),
+                                       wfMsgExt( 'cannotdelete', array( 'parse' ), $this->mTitle->getPrefixedText() )
+                               )
+                       );
+                       $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+                       LogEventsList::showLogExtract(
+                               $wgOut,
+                               'delete',
+                               $this->mTitle->getPrefixedText()
+                       );
+
+                       return;
+               }
+
+               # Hack for big sites
+               $bigHistory = $this->isBigDeletion();
+               if ( $bigHistory && !$this->mTitle->userCan( 'bigdelete' ) ) {
+                       global $wgLang, $wgDeleteRevisionsLimit;
+
+                       $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n",
+                               array( 'delete-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) );
+
                        return;
                }
 
-               if( $confirm ) {
-                       $this->doDelete( $reason );
-                       if( $wgRequest->getCheck( 'wpWatch' ) ) {
+               if ( $confirm ) {
+                       $this->doDelete( $reason, $suppress );
+
+                       if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) {
                                $this->doWatch();
-                       } elseif( $this->mTitle->userIsWatching() ) {
+                       } elseif ( $this->mTitle->userIsWatching() ) {
                                $this->doUnwatch();
                        }
+
                        return;
                }
 
-               # determine whether this page has earlier revisions
-               # and insert a warning if it does
-               $maxRevisions = 20;
-               $authors = $this->getLastNAuthors( $maxRevisions, $latest );
-
-               if( count( $authors ) > 1 && !$confirm ) {
-                       $skin=$wgUser->getSkin();
-                       $wgOut->addHTML( '<strong>' . wfMsg( 'historywarning' ) . ' ' . $skin->historyLink() . '</strong>' );
+               // Generate deletion reason
+               $hasHistory = false;
+               if ( !$reason ) {
+                       $reason = $this->generateReason( $hasHistory );
                }
 
-               # If a single user is responsible for all revisions, find out who they are
-               if ( count( $authors ) == $maxRevisions ) {
-                       // Query bailed out, too many revisions to find out if they're all the same
-                       $authorOfAll = false;
-               } else {
-                       $authorOfAll = reset( $authors );
-                       foreach ( $authors as $author ) {
-                               if ( $authorOfAll != $author ) {
-                                       $authorOfAll = false;
-                                       break;
-                               }
+               // If the page has a history, insert a warning
+               if ( $hasHistory && !$confirm ) {
+                       global $wgLang;
+
+                       $skin = $wgUser->getSkin();
+                       $revisions = $this->estimateRevisionCount();
+                       //FIXME: lego
+                       $wgOut->addHTML( '<strong class="mw-delete-warning-revisions">' .
+                               wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) .
+                               wfMsgHtml( 'word-separator' ) . $skin->historyLink() .
+                               '</strong>'
+                       );
+
+                       if ( $bigHistory ) {
+                               global $wgDeleteRevisionsLimit;
+                               $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n",
+                                       array( 'delete-warning-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) );
                        }
                }
-               # Fetch article text
-               $rev = Revision::newFromTitle( $this->mTitle );
 
-               if( !is_null( $rev ) ) {
-                       # if this is a mini-text, we can paste part of it into the deletion reason
-                       $text = $rev->getText();
-
-                       #if this is empty, an earlier revision may contain "useful" text
-                       $blanked = false;
-                       if( $text == '' ) {
-                               $prev = $rev->getPrevious();
-                               if( $prev ) {
-                                       $text = $prev->getText();
-                                       $blanked = true;
-                               }
-                       }
+               return $this->confirmDelete( $reason );
+       }
 
-                       $length = strlen( $text );
+       /**
+        * @return bool whether or not the page surpasses $wgDeleteRevisionsLimit revisions
+        */
+       public function isBigDeletion() {
+               global $wgDeleteRevisionsLimit;
 
-                       # this should not happen, since it is not possible to store an empty, new
-                       # page. Let's insert a standard text in case it does, though
-                       if( $length == 0 && $reason === '' ) {
-                               $reason = wfMsgForContent( 'exblank' );
-                       }
+               if ( $wgDeleteRevisionsLimit ) {
+                       $revCount = $this->estimateRevisionCount();
 
-                       if( $reason === '' ) {
-                               # comment field=255, let's grep the first 150 to have some user
-                               # space left
-                               global $wgContLang;
-                               $text = $wgContLang->truncate( $text, 150, '...' );
+                       return $revCount > $wgDeleteRevisionsLimit;
+               }
 
-                               # let's strip out newlines
-                               $text = preg_replace( "/[\n\r]/", '', $text );
+               return false;
+       }
 
-                               if( !$blanked ) {
-                                       if( $authorOfAll === false ) {
-                                               $reason = wfMsgForContent( 'excontent', $text );
-                                       } else {
-                                               $reason = wfMsgForContent( 'excontentauthor', $text, $authorOfAll );
-                                       }
-                               } else {
-                                       $reason = wfMsgForContent( 'exbeforeblank', $text );
-                               }
-                       }
-               }
+       /**
+        * @return int approximate revision count
+        */
+       public function estimateRevisionCount() {
+               $dbr = wfGetDB( DB_SLAVE );
 
-               return $this->confirmDelete( '', $reason );
+               // For an exact count...
+               // return $dbr->selectField( 'revision', 'COUNT(*)',
+               //      array( 'rev_page' => $this->getId() ), __METHOD__ );
+               return $dbr->estimateRowCount( 'revision', '*',
+                       array( 'rev_page' => $this->getId() ), __METHOD__ );
        }
 
        /**
         * Get the last N authors
-        * @param int $num Number of revisions to get
-        * @param string $revLatest The latest rev_id, selected from the master (optional)
+        * @param $num Integer: number of revisions to get
+        * @param $revLatest String: the latest rev_id, selected from the master (optional)
         * @return array Array of authors, duplicates not removed
         */
-       function getLastNAuthors( $num, $revLatest = 0 ) {
+       public function getLastNAuthors( $num, $revLatest = 0 ) {
                wfProfileIn( __METHOD__ );
-
                // First try the slave
                // If that doesn't have the latest revision, try the master
                $continue = 2;
                $db = wfGetDB( DB_SLAVE );
+
                do {
                        $res = $db->select( array( 'page', 'revision' ),
                                array( 'rev_id', 'rev_user_text' ),
@@ -1967,11 +2978,14 @@ class Article {
                                        'LIMIT' => $num
                                ) )
                        );
+
                        if ( !$res ) {
                                wfProfileOut( __METHOD__ );
                                return array();
                        }
+
                        $row = $db->fetchObject( $res );
+
                        if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
                                $db = wfGetDB( DB_MASTER );
                                $continue--;
@@ -1981,100 +2995,161 @@ class Article {
                } while ( $continue );
 
                $authors = array( $row->rev_user_text );
-               while ( $row = $db->fetchObject( $res ) ) {
+
+               foreach ( $res as $row ) {
                        $authors[] = $row->rev_user_text;
                }
+
                wfProfileOut( __METHOD__ );
                return $authors;
        }
 
        /**
         * Output deletion confirmation dialog
+        * FIXME: Move to another file?
+        * @param $reason String: prefilled reason
         */
-       function confirmDelete( $par, $reason ) {
+       public function confirmDelete( $reason ) {
                global $wgOut, $wgUser;
 
                wfDebug( "Article::confirmDelete\n" );
 
-               $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
-               $wgOut->setSubtitle( wfMsg( 'deletesub', $sub ) );
-               $wgOut->setRobotpolicy( 'noindex,nofollow' );
-               $wgOut->addWikiText( wfMsg( 'confirmdeletetext' ) );
-
-               $formaction = $this->mTitle->escapeLocalURL( 'action=delete' . $par );
-
-               $confirm = htmlspecialchars( wfMsg( 'deletepage' ) );
-               $delcom = htmlspecialchars( wfMsg( 'deletecomment' ) );
-               $token = htmlspecialchars( $wgUser->editToken() );
-               $watch = Xml::checkLabel( wfMsg( 'watchthis' ), 'wpWatch', 'wpWatch', $wgUser->getBoolOption( 'watchdeletion' ) || $this->mTitle->userIsWatching(), array( 'tabindex' => '2' ) );
-
-               $wgOut->addHTML( "
-<form id='deleteconfirm' method='post' action=\"{$formaction}\">
-       <table border='0'>
-               <tr>
-                       <td align='right'>
-                               <label for='wpReason'>{$delcom}:</label>
-                       </td>
-                       <td align='left'>
-                               <input type='text' size='60' name='wpReason' id='wpReason' value=\"" . htmlspecialchars( $reason ) . "\" tabindex=\"1\" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>&nbsp;</td>
-                       <td>$watch</td>
-               </tr>
-               <tr>
-                       <td>&nbsp;</td>
-                       <td>
-                               <input type='submit' name='wpConfirmB' id='wpConfirmB' value=\"{$confirm}\" tabindex=\"3\" />
-                       </td>
-               </tr>
-       </table>
-       <input type='hidden' name='wpEditToken' value=\"{$token}\" />
-</form>\n" );
-
-               $wgOut->returnToMain( false );
-
-               $this->showLogExtract( $wgOut );
-       }
+               $deleteBackLink = $wgUser->getSkin()->linkKnown( $this->mTitle );
+               $wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $deleteBackLink ) );
+               $wgOut->setRobotPolicy( 'noindex,nofollow' );
+               $wgOut->addWikiMsg( 'confirmdeletetext' );
+
+               wfRunHooks( 'ArticleConfirmDelete', array( $this, $wgOut, &$reason ) );
+
+               if ( $wgUser->isAllowed( 'suppressrevision' ) ) {
+                       $suppress = "<tr id=\"wpDeleteSuppressRow\" name=\"wpDeleteSuppressRow\">
+                                       <td></td>
+                                       <td class='mw-input'><strong>" .
+                                               Xml::checkLabel( wfMsg( 'revdelete-suppress' ),
+                                                       'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '4' ) ) .
+                                       "</strong></td>
+                               </tr>";
+               } else {
+                       $suppress = '';
+               }
+               $checkWatch = $wgUser->getBoolOption( 'watchdeletion' ) || $this->mTitle->userIsWatching();
+
+               $form = Xml::openElement( 'form', array( 'method' => 'post',
+                       'action' => $this->mTitle->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) .
+                       Xml::openElement( 'fieldset', array( 'id' => 'mw-delete-table' ) ) .
+                       Xml::tags( 'legend', null, wfMsgExt( 'delete-legend', array( 'parsemag', 'escapenoentities' ) ) ) .
+                       Xml::openElement( 'table', array( 'id' => 'mw-deleteconfirm-table' ) ) .
+                       "<tr id=\"wpDeleteReasonListRow\">
+                               <td class='mw-label'>" .
+                                       Xml::label( wfMsg( 'deletecomment' ), 'wpDeleteReasonList' ) .
+                               "</td>
+                               <td class='mw-input'>" .
+                                       Xml::listDropDown( 'wpDeleteReasonList',
+                                               wfMsgForContent( 'deletereason-dropdown' ),
+                                               wfMsgForContent( 'deletereasonotherlist' ), '', 'wpReasonDropDown', 1 ) .
+                               "</td>
+                       </tr>
+                       <tr id=\"wpDeleteReasonRow\">
+                               <td class='mw-label'>" .
+                                       Xml::label( wfMsg( 'deleteotherreason' ), 'wpReason' ) .
+                               "</td>
+                               <td class='mw-input'>" .
+                               Html::input( 'wpReason', $reason, 'text', array(
+                                       'size' => '60',
+                                       'maxlength' => '255',
+                                       'tabindex' => '2',
+                                       'id' => 'wpReason',
+                                       'autofocus'
+                               ) ) .
+                               "</td>
+                       </tr>";
+
+               # Disallow watching if user is not logged in
+               if ( $wgUser->isLoggedIn() ) {
+                       $form .= "
+                       <tr>
+                               <td></td>
+                               <td class='mw-input'>" .
+                                       Xml::checkLabel( wfMsg( 'watchthis' ),
+                                               'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) .
+                               "</td>
+                       </tr>";
+               }
 
+               $form .= "
+                       $suppress
+                       <tr>
+                               <td></td>
+                               <td class='mw-submit'>" .
+                                       Xml::submitButton( wfMsg( 'deletepage' ),
+                                               array( 'name' => 'wpConfirmB', 'id' => 'wpConfirmB', 'tabindex' => '5' ) ) .
+                               "</td>
+                       </tr>" .
+                       Xml::closeElement( 'table' ) .
+                       Xml::closeElement( 'fieldset' ) .
+                       Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
+                       Xml::closeElement( 'form' );
+
+                       if ( $wgUser->isAllowed( 'editinterface' ) ) {
+                               $skin = $wgUser->getSkin();
+                               $title = Title::makeTitle( NS_MEDIAWIKI, 'Deletereason-dropdown' );
+                               $link = $skin->link(
+                                       $title,
+                                       wfMsgHtml( 'delete-edit-reasonlist' ),
+                                       array(),
+                                       array( 'action' => 'edit' )
+                               );
+                               $form .= '<p class="mw-delete-editreasons">' . $link . '</p>';
+                       }
 
-       /**
-        * Show relevant lines from the deletion log
-        */
-       function showLogExtract( $out ) {
-               $out->addHtml( '<h2>' . htmlspecialchars( LogPage::logName( 'delete' ) ) . '</h2>' );
-               $logViewer = new LogViewer(
-                       new LogReader(
-                               new FauxRequest(
-                                       array( 'page' => $this->mTitle->getPrefixedText(),
-                                              'type' => 'delete' ) ) ) );
-               $logViewer->showList( $out );
+               $wgOut->addHTML( $form );
+               $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+               LogEventsList::showLogExtract( $wgOut, 'delete',
+                       $this->mTitle->getPrefixedText()
+               );
        }
 
-
        /**
         * Perform a deletion and output success or failure messages
         */
-       function doDelete( $reason ) {
+       public function doDelete( $reason, $suppress = false ) {
                global $wgOut, $wgUser;
-               wfDebug( __METHOD__."\n" );
 
-               if (wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason))) {
-                       if ( $this->doDeleteArticle( $reason ) ) {
-                               $deleted = wfEscapeWikiText( $this->mTitle->getPrefixedText() );
+               $id = $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE );
+
+               $error = '';
+               if ( wfRunHooks( 'ArticleDelete', array( &$this, &$wgUser, &$reason, &$error ) ) ) {
+                       if ( $this->doDeleteArticle( $reason, $suppress, $id ) ) {
+                               $deleted = $this->mTitle->getPrefixedText();
 
                                $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
-                               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+                               $wgOut->setRobotPolicy( 'noindex,nofollow' );
 
-                               $loglink = '[[Special:Log/delete|' . wfMsg( 'deletionlog' ) . ']]';
-                               $text = wfMsg( 'deletedtext', $deleted, $loglink );
+                               $loglink = '[[Special:Log/delete|' . wfMsgNoTrans( 'deletionlog' ) . ']]';
 
-                               $wgOut->addWikiText( $text );
+                               $wgOut->addWikiMsg( 'deletedtext', $deleted, $loglink );
                                $wgOut->returnToMain( false );
-                               wfRunHooks('ArticleDeleteComplete', array(&$this, &$wgUser, $reason));
+                               wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$wgUser, $reason, $id ) );
+                       }
+               } else {
+                       if ( $error == '' ) {
+                               $wgOut->showFatalError(
+                                       Html::rawElement(
+                                               'div',
+                                               array( 'class' => 'error mw-error-cannotdelete' ),
+                                               wfMsgExt( 'cannotdelete', array( 'parse' ), $this->mTitle->getPrefixedText() )
+                                       )
+                               );
+
+                               $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+
+                               LogEventsList::showLogExtract(
+                                       $wgOut,
+                                       'delete',
+                                       $this->mTitle->getPrefixedText()
+                               );
                        } else {
-                               $wgOut->showFatalError( wfMsg( 'cannotdelete' ) );
+                               $wgOut->showFatalError( $error );
                        }
                }
        }
@@ -2082,26 +3157,46 @@ class Article {
        /**
         * Back-end article deletion
         * Deletes the article with database consistency, writes logs, purges caches
-        * Returns success
+        *
+        * @param $reason string delete reason for deletion log
+        * @param suppress bitfield
+        *      Revision::DELETED_TEXT
+        *      Revision::DELETED_COMMENT
+        *      Revision::DELETED_USER
+        *      Revision::DELETED_RESTRICTED
+        * @param $id int article ID
+        * @param $commit boolean defaults to true, triggers transaction end
+        * @return boolean true if successful
         */
-       function doDeleteArticle( $reason ) {
-               global $wgUseSquid, $wgDeferredUpdateList;
-               global $wgUseTrackbacks;
+       public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true ) {
+               global $wgDeferredUpdateList, $wgUseTrackbacks;
 
-               wfDebug( __METHOD__."\n" );
+               wfDebug( __METHOD__ . "\n" );
 
                $dbw = wfGetDB( DB_MASTER );
-               $ns = $this->mTitle->getNamespace();
                $t = $this->mTitle->getDBkey();
-               $id = $this->mTitle->getArticleID();
+               $id = $id ? $id : $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE );
 
-               if ( $t == '' || $id == 0 ) {
+               if ( $t === '' || $id == 0 ) {
                        return false;
                }
 
-               $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getContent() ), -1 );
+               $u = new SiteStatsUpdate( 0, 1, - (int)$this->isCountable( $this->getRawText() ), -1 );
                array_push( $wgDeferredUpdateList, $u );
 
+               // Bitfields to further suppress the content
+               if ( $suppress ) {
+                       $bitfield = 0;
+                       // This should be 15...
+                       $bitfield |= Revision::DELETED_TEXT;
+                       $bitfield |= Revision::DELETED_COMMENT;
+                       $bitfield |= Revision::DELETED_USER;
+                       $bitfield |= Revision::DELETED_RESTRICTED;
+               } else {
+                       $bitfield = 'rev_deleted';
+               }
+
+               $dbw->begin();
                // For now, shunt the revision data into the archive table.
                // Text is *not* removed from the text table; bulk storage
                // is left intact to avoid breaking block-compression or
@@ -2125,8 +3220,9 @@ class Article {
                                'ar_text_id'    => 'rev_text_id',
                                'ar_text'       => '\'\'', // Be explicit to appease
                                'ar_flags'      => '\'\'', // MySQL's "strict mode"...
-                               'ar_len'                => 'rev_len',
+                               'ar_len'        => 'rev_len',
                                'ar_page_id'    => 'page_id',
+                               'ar_deleted'    => $bitfield
                        ), array(
                                'page_id' => $id,
                                'page_id = rev_page'
@@ -2137,14 +3233,29 @@ class Article {
                $dbw->delete( 'page_restrictions', array ( 'pr_page' => $id ), __METHOD__ );
 
                # Now that it's safely backed up, delete it
-               $dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__);
+               $dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__ );
+               $ok = ( $dbw->affectedRows() > 0 ); // getArticleId() uses slave, could be laggy
+
+               if ( !$ok ) {
+                       $dbw->rollback();
+                       return false;
+               }
+
+               # Fix category table counts
+               $cats = array();
+               $res = $dbw->select( 'categorylinks', 'cl_to', array( 'cl_from' => $id ), __METHOD__ );
+
+               foreach ( $res as $row ) {
+                       $cats [] = $row->cl_to;
+               }
+
+               $this->updateCategoryCounts( array(), $cats );
 
                # If using cascading deletes, we can skip some explicit deletes
                if ( !$dbw->cascadingDeletes() ) {
-
                        $dbw->delete( 'revision', array( 'rev_page' => $id ), __METHOD__ );
 
-                       if ($wgUseTrackbacks)
+                       if ( $wgUseTrackbacks )
                                $dbw->delete( 'trackbacks', array( 'tb_page' => $id ), __METHOD__ );
 
                        # Delete outgoing links
@@ -2154,142 +3265,225 @@ class Article {
                        $dbw->delete( 'templatelinks', array( 'tl_from' => $id ) );
                        $dbw->delete( 'externallinks', array( 'el_from' => $id ) );
                        $dbw->delete( 'langlinks', array( 'll_from' => $id ) );
+                       $dbw->delete( 'iwlinks', array( 'iwl_from' => $id ) );
                        $dbw->delete( 'redirect', array( 'rd_from' => $id ) );
                }
 
                # If using cleanup triggers, we can skip some manual deletes
                if ( !$dbw->cleanupTriggers() ) {
-
                        # Clean up recentchanges entries...
-                       $dbw->delete( 'recentchanges', array( 'rc_namespace' => $ns, 'rc_title' => $t ), __METHOD__ );
+                       $dbw->delete( 'recentchanges',
+                               array( 'rc_type != ' . RC_LOG,
+                                       'rc_namespace' => $this->mTitle->getNamespace(),
+                                       'rc_title' => $this->mTitle->getDBkey() ),
+                               __METHOD__ );
+                       $dbw->delete( 'recentchanges',
+                               array( 'rc_type != ' . RC_LOG, 'rc_cur_id' => $id ),
+                               __METHOD__ );
                }
 
                # Clear caches
                Article::onArticleDelete( $this->mTitle );
 
-               # Log the deletion
-               $log = new LogPage( 'delete' );
-               $log->addEntry( 'delete', $this->mTitle, $reason );
-
                # Clear the cached article id so the interface doesn't act like we exist
                $this->mTitle->resetArticleID( 0 );
-               $this->mTitle->mArticleID = 0;
+
+               # Log the deletion, if the page was suppressed, log it at Oversight instead
+               $logtype = $suppress ? 'suppress' : 'delete';
+               $log = new LogPage( $logtype );
+
+               # Make sure logging got through
+               $log->addEntry( 'delete', $this->mTitle, $reason, array() );
+
+               if ( $commit ) {
+                       $dbw->commit();
+               }
+
                return true;
        }
 
        /**
         * Roll back the most recent consecutive set of edits to a page
         * from the same user; fails if there are no eligible edits to
-        * roll back to, e.g. user is the sole contributor
+        * roll back to, e.g. user is the sole contributor. This function
+        * performs permissions checks on $wgUser, then calls commitRollback()
+        * to do the dirty work
         *
-        * @param string $fromP - Name of the user whose edits to rollback. 
-        * @param string $summary - Custom summary. Set to default summary if empty.
-        * @param string $token - Rollback token.
-        * @param bool $bot - If true, mark all reverted edits as bot.
-        * 
-        * @param array $resultDetails contains result-specific dict of additional values
-        *    ALREADY_ROLLED : 'current' (rev)
-        *    SUCCESS        : 'summary' (str), 'current' (rev), 'target' (rev)
-        * 
-        * @return self::SUCCESS on succes, self::* on failure
+        * @param $fromP String: Name of the user whose edits to rollback.
+        * @param $summary String: Custom summary. Set to default summary if empty.
+        * @param $token String: Rollback token.
+        * @param $bot Boolean: If true, mark all reverted edits as bot.
+        *
+        * @param $resultDetails Array: contains result-specific array of additional values
+        *    'alreadyrolled' : 'current' (rev)
+        *    success        : 'summary' (str), 'current' (rev), 'target' (rev)
+        *
+        * @return array of errors, each error formatted as
+        *   array(messagekey, param1, param2, ...).
+        * On success, the array is empty.  This array can also be passed to
+        * OutputPage::showPermissionsErrorPage().
         */
        public function doRollback( $fromP, $summary, $token, $bot, &$resultDetails ) {
-               global $wgUser, $wgUseRCPatrol;
+               global $wgUser;
+
                $resultDetails = null;
-               
-               if( $wgUser->isAllowed( 'rollback' ) ) {
-                       if( $wgUser->isBlocked() ) {
-                               return self::BLOCKED;
-                       }
-               } else {
-                       return self::PERM_DENIED;
+
+               # Check permissions
+               $editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser );
+               $rollbackErrors = $this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser );
+               $errors = array_merge( $editErrors, wfArrayDiff2( $rollbackErrors, $editErrors ) );
+
+               if ( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) ) {
+                       $errors[] = array( 'sessionfailure' );
                }
-                       
-               if ( wfReadOnly() ) {
-                       return self::READONLY;
+
+               if ( $wgUser->pingLimiter( 'rollback' ) || $wgUser->pingLimiter() ) {
+                       $errors[] = array( 'actionthrottledtext' );
+               }
+
+               # If there were errors, bail out now
+               if ( !empty( $errors ) ) {
+                       return $errors;
                }
-               if( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) )
-                       return self::BAD_TOKEN;
+
+               return $this->commitRollback( $fromP, $summary, $bot, $resultDetails );
+       }
+
+       /**
+        * Backend implementation of doRollback(), please refer there for parameter
+        * and return value documentation
+        *
+        * NOTE: This function does NOT check ANY permissions, it just commits the
+        * rollback to the DB Therefore, you should only call this function direct-
+        * ly if you want to use custom permissions checks. If you don't, use
+        * doRollback() instead.
+        */
+       public function commitRollback( $fromP, $summary, $bot, &$resultDetails ) {
+               global $wgUseRCPatrol, $wgUser, $wgLang;
 
                $dbw = wfGetDB( DB_MASTER );
 
+               if ( wfReadOnly() ) {
+                       return array( array( 'readonlytext' ) );
+               }
+
                # Get the last editor
                $current = Revision::newFromTitle( $this->mTitle );
-               if( is_null( $current ) ) {
+               if ( is_null( $current ) ) {
                        # Something wrong... no page?
-                       return self::BAD_TITLE;
+                       return array( array( 'notanarticle' ) );
                }
 
                $from = str_replace( '_', ' ', $fromP );
-               if( $from != $current->getUserText() ) {
+               # User name given should match up with the top revision.
+               # If the user was deleted then $from should be empty.
+               if ( $from != $current->getUserText() ) {
                        $resultDetails = array( 'current' => $current );
-                       return self::ALREADY_ROLLED;
+                       return array( array( 'alreadyrolled',
+                               htmlspecialchars( $this->mTitle->getPrefixedText() ),
+                               htmlspecialchars( $fromP ),
+                               htmlspecialchars( $current->getUserText() )
+                       ) );
                }
 
-               # Get the last edit not by this guy
-               $user = intval( $current->getUser() );
-               $user_text = $dbw->addQuotes( $current->getUserText() );
+               # Get the last edit not by this guy...
+               # Note: these may not be public values
+               $user = intval( $current->getRawUser() );
+               $user_text = $dbw->addQuotes( $current->getRawUserText() );
                $s = $dbw->selectRow( 'revision',
-                       array( 'rev_id', 'rev_timestamp' ),
-                       array(
-                               'rev_page' => $current->getPage(),
-                               "rev_user <> {$user} OR rev_user_text <> {$user_text}"
+                       array( 'rev_id', 'rev_timestamp', 'rev_deleted' ),
+                       array( 'rev_page' => $current->getPage(),
+                               "rev_user != {$user} OR rev_user_text != {$user_text}"
                        ), __METHOD__,
-                       array(
-                               'USE INDEX' => 'page_timestamp',
-                               'ORDER BY'  => 'rev_timestamp DESC' )
+                       array( 'USE INDEX' => 'page_timestamp',
+                               'ORDER BY' => 'rev_timestamp DESC' )
                        );
-               if( $s === false ) {
-                       # Something wrong
-                       return self::ONLY_AUTHOR;
+               if ( $s === false ) {
+                       # No one else ever edited this page
+                       return array( array( 'cantrollback' ) );
+               } else if ( $s->rev_deleted & Revision::DELETED_TEXT || $s->rev_deleted & Revision::DELETED_USER ) {
+                       # Only admins can see this text
+                       return array( array( 'notvisiblerev' ) );
                }
-       
+
                $set = array();
-               if ( $bot ) {
+               if ( $bot && $wgUser->isAllowed( 'markbotedits' ) ) {
                        # Mark all reverted edits as bot
                        $set['rc_bot'] = 1;
                }
+
                if ( $wgUseRCPatrol ) {
                        # Mark all reverted edits as patrolled
                        $set['rc_patrolled'] = 1;
                }
 
-               if ( $set ) {
+               if ( count( $set ) ) {
                        $dbw->update( 'recentchanges', $set,
-                                       array( /* WHERE */
-                                               'rc_cur_id' => $current->getPage(),
-                                               'rc_user_text' => $current->getUserText(),
-                                               "rc_timestamp > '{$s->rev_timestamp}'",
-                                       ), __METHOD__
-                               );
+                               array( /* WHERE */
+                                       'rc_cur_id' => $current->getPage(),
+                                       'rc_user_text' => $current->getUserText(),
+                                       "rc_timestamp > '{$s->rev_timestamp}'",
+                               ), __METHOD__
+                       );
                }
 
-               # Get the edit summary
+               # Generate the edit summary if necessary
                $target = Revision::newFromId( $s->rev_id );
-               if( empty( $summary ) )
-                       $summary = wfMsgForContent( 'revertpage', $target->getUserText(), $from );
+               if ( empty( $summary ) ) {
+                       if ( $from == '' ) { // no public user name
+                               $summary = wfMsgForContent( 'revertpage-nouser' );
+                       } else {
+                               $summary = wfMsgForContent( 'revertpage' );
+                       }
+               }
+
+               # Allow the custom summary to use the same args as the default message
+               $args = array(
+                       $target->getUserText(), $from, $s->rev_id,
+                       $wgLang->timeanddate( wfTimestamp( TS_MW, $s->rev_timestamp ), true ),
+                       $current->getId(), $wgLang->timeanddate( $current->getTimestamp() )
+               );
+               $summary = wfMsgReplaceArgs( $summary, $args );
 
                # Save
-               $flags = EDIT_UPDATE | EDIT_MINOR;
-               if( $bot )
+               $flags = EDIT_UPDATE;
+
+               if ( $wgUser->isAllowed( 'minoredit' ) ) {
+                       $flags |= EDIT_MINOR;
+               }
+
+               if ( $bot && ( $wgUser->isAllowed( 'markbotedits' ) || $wgUser->isAllowed( 'bot' ) ) ) {
                        $flags |= EDIT_FORCE_BOT;
-               $this->doEdit( $target->getText(), $summary, $flags );
+               }
+
+               # Actually store the edit
+               $status = $this->doEdit( $target->getText(), $summary, $flags, $target->getId() );
+               if ( !empty( $status->value['revision'] ) ) {
+                       $revId = $status->value['revision']->getId();
+               } else {
+                       $revId = false;
+               }
+
+               wfRunHooks( 'ArticleRollbackComplete', array( $this, $wgUser, $target, $current ) );
 
                $resultDetails = array(
                        'summary' => $summary,
                        'current' => $current,
-                       'target' => $target,
+                       'target'  => $target,
+                       'newid'   => $revId
                );
-               return self::SUCCESS;
+
+               return array();
        }
 
        /**
         * User interface for rollback operations
         */
-       function rollback() {
-               global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
+       public function rollback() {
+               global $wgUser, $wgOut, $wgRequest;
 
                $details = null;
+
                $result = $this->doRollback(
                        $wgRequest->getVal( 'from' ),
                        $wgRequest->getText( 'summary' ),
@@ -2298,122 +3492,173 @@ class Article {
                        $details
                );
 
-               switch( $result ) {
-                       case self::BLOCKED:
-                               $wgOut->blockedPage();
-                               break;
-                       case self::PERM_DENIED:
-                               $wgOut->permissionRequired( 'rollback' );
-                               break;
-                       case self::READONLY:
-                               $wgOut->readOnlyPage( $this->getContent() );
-                               break;
-                       case self::BAD_TOKEN:
-                               $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
-                               $wgOut->addWikiText( wfMsg( 'sessionfailure' ) );
-                               break;
-                       case self::BAD_TITLE:
-                               $wgOut->addHtml( wfMsg( 'notanarticle' ) );
-                               break;
-                       case self::ALREADY_ROLLED:
+               if ( in_array( array( 'actionthrottledtext' ), $result ) ) {
+                       $wgOut->rateLimited();
+                       return;
+               }
+
+               if ( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ) {
+                       $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
+                       $errArray = $result[0];
+                       $errMsg = array_shift( $errArray );
+                       $wgOut->addWikiMsgArray( $errMsg, $errArray );
+
+                       if ( isset( $details['current'] ) ) {
                                $current = $details['current'];
-                               $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
-                               $wgOut->addWikiText(
-                                       wfMsg( 'alreadyrolled',
-                                               htmlspecialchars( $this->mTitle->getPrefixedText() ),
-                                               htmlspecialchars( $wgRequest->getVal( 'from' ) ),
-                                               htmlspecialchars( $current->getUserText() )
-                                       )
-                               );
-                               if( $current->getComment() != '' ) {
-                                       $wgOut->addHtml( wfMsg( 'editcomment',
-                                               $wgUser->getSkin()->formatComment( $current->getComment() ) ) );
+
+                               if ( $current->getComment() != '' ) {
+                                       $wgOut->addWikiMsgArray( 'editcomment', array(
+                                               $wgUser->getSkin()->formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
                                }
-                               break;
-                       case self::ONLY_AUTHOR:
-                               $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
-                               $wgOut->addHtml( wfMsg( 'cantrollback' ) );
-                               break;
-                       case self::SUCCESS:
-                               $current = $details['current'];
-                               $target = $details['target'];
-                               $wgOut->setPageTitle( wfMsg( 'actioncomplete' ) );
-                               $wgOut->setRobotPolicy( 'noindex,nofollow' );
-                               $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
-                                       . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
-                               $new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
-                                       . $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
-                               $wgOut->addHtml( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
-                               $wgOut->returnToMain( false, $this->mTitle );
-                               break;
-                       default:
-                               throw new MWException( __METHOD__ . ": Unknown return value `{$result}`" );
+                       }
+
+                       return;
                }
 
-       }
+               # Display permissions errors before read-only message -- there's no
+               # point in misleading the user into thinking the inability to rollback
+               # is only temporary.
+               if ( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) {
+                       # array_diff is completely broken for arrays of arrays, sigh.
+                       # Remove any 'readonlytext' error manually.
+                       $out = array();
+                       foreach ( $result as $error ) {
+                               if ( $error != array( 'readonlytext' ) ) {
+                                       $out [] = $error;
+                               }
+                       }
+                       $wgOut->showPermissionsErrorPage( $out );
+
+                       return;
+               }
+
+               if ( $result == array( array( 'readonlytext' ) ) ) {
+                       $wgOut->readOnlyPage();
+
+                       return;
+               }
+
+               $current = $details['current'];
+               $target = $details['target'];
+               $newId = $details['newid'];
+               $wgOut->setPageTitle( wfMsg( 'actioncomplete' ) );
+               $wgOut->setRobotPolicy( 'noindex,nofollow' );
+
+               if ( $current->getUserText() === '' ) {
+                       $old = wfMsg( 'rev-deleted-user' );
+               } else {
+                       $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
+                               . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
+               }
 
+               $new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
+                       . $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
+               $wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
+               $wgOut->returnToMain( false, $this->mTitle );
+
+               if ( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) {
+                       $de = new DifferenceEngine( $this->mTitle, $current->getId(), $newId, false, true );
+                       $de->showDiff( '', '' );
+               }
+       }
 
        /**
         * Do standard deferred updates after page view
-        * @private
         */
-       function viewUpdates() {
-               global $wgDeferredUpdateList;
+       public function viewUpdates() {
+               global $wgDeferredUpdateList, $wgDisableCounters, $wgUser;
+               if ( wfReadOnly() ) {
+                       return;
+               }
 
-               if ( 0 != $this->getID() ) {
-                       global $wgDisableCounters;
-                       if( !$wgDisableCounters ) {
-                               Article::incViewCount( $this->getID() );
-                               $u = new SiteStatsUpdate( 1, 0, 0 );
-                               array_push( $wgDeferredUpdateList, $u );
-                       }
+               # Don't update page view counters on views from bot users (bug 14044)
+               if ( !$wgDisableCounters && !$wgUser->isAllowed( 'bot' ) && $this->getID() ) {
+                       Article::incViewCount( $this->getID() );
+                       $u = new SiteStatsUpdate( 1, 0, 0 );
+                       array_push( $wgDeferredUpdateList, $u );
+               }
+
+               # Update newtalk / watchlist notification status
+               $wgUser->clearNotification( $this->mTitle );
+       }
+
+       /**
+        * Prepare text which is about to be saved.
+        * Returns a stdclass with source, pst and output members
+        */
+       public function prepareTextForEdit( $text, $revid = null ) {
+               if ( $this->mPreparedEdit && $this->mPreparedEdit->newText == $text && $this->mPreparedEdit->revid == $revid ) {
+                       // Already prepared
+                       return $this->mPreparedEdit;
                }
 
-               # Update newtalk / watchlist notification status
-               global $wgUser;
-               $wgUser->clearNotification( $this->mTitle );
+               global $wgParser;
+
+               $edit = (object)array();
+               $edit->revid = $revid;
+               $edit->newText = $text;
+               $edit->pst = $this->preSaveTransform( $text );
+               $edit->popts = $this->getParserOptions();
+               $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $edit->popts, true, true, $revid );
+               $edit->oldText = $this->getContent();
+
+               $this->mPreparedEdit = $edit;
+
+               return $edit;
        }
 
        /**
         * Do standard deferred updates after page edit.
         * Update links tables, site stats, search index and message cache.
+        * Purges pages that include this page if the text was changed here.
         * Every 100th edit, prune the recent changes table.
         *
         * @private
-        * @param $text New text of the article
-        * @param $summary Edit summary
-        * @param $minoredit Minor edit
+        * @param $text String: New text of the article
+        * @param $summary String: Edit summary
+        * @param $minoredit Boolean: Minor edit
         * @param $timestamp_of_pagechange Timestamp associated with the page change
-        * @param $newid rev_id value of the new revision
-        * @param $changed Whether or not the content actually changed
+        * @param $newid Integer: rev_id value of the new revision
+        * @param $changed Boolean: Whether or not the content actually changed
         */
-       function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true ) {
-               global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser;
+       public function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true ) {
+               global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgEnableParserCache;
 
                wfProfileIn( __METHOD__ );
 
                # Parse the text
-               $options = new ParserOptions;
-               $options->setTidy(true);
-               $poutput = $wgParser->parse( $text, $this->mTitle, $options, true, true, $newid );
+               # Be careful not to double-PST: $text is usually already PST-ed once
+               if ( !$this->mPreparedEdit || $this->mPreparedEdit->output->getFlag( 'vary-revision' ) ) {
+                       wfDebug( __METHOD__ . ": No prepared edit or vary-revision is set...\n" );
+                       $editInfo = $this->prepareTextForEdit( $text, $newid );
+               } else {
+                       wfDebug( __METHOD__ . ": No vary-revision, using prepared edit...\n" );
+                       $editInfo = $this->mPreparedEdit;
+               }
 
                # Save it to the parser cache
-               $parserCache =& ParserCache::singleton();
-               $parserCache->save( $poutput, $this, $wgUser );
+               if ( $wgEnableParserCache ) {
+                       $parserCache = ParserCache::singleton();
+                       $parserCache->save( $editInfo->output, $this, $editInfo->popts );
+               }
 
                # Update the links tables
-               $u = new LinksUpdate( $this->mTitle, $poutput );
+               $u = new LinksUpdate( $this->mTitle, $editInfo->output );
                $u->doUpdate();
 
-               if( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
+               wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $changed ) );
+
+               if ( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
                        if ( 0 == mt_rand( 0, 99 ) ) {
                                // Flush old entries from the `recentchanges` table; we do this on
                                // random requests so as to avoid an increase in writes for no good reason
                                global $wgRCMaxAge;
+
                                $dbw = wfGetDB( DB_MASTER );
                                $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
                                $recentchanges = $dbw->tableName( 'recentchanges' );
                                $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'";
+
                                $dbw->query( $sql );
                        }
                }
@@ -2436,17 +3681,20 @@ class Article {
                # Don't do this if $changed = false otherwise some idiot can null-edit a
                # load of user talk pages and piss people off, nor if it's a minor edit
                # by a properly-flagged bot.
-               if( $this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getTitleKey() && $changed
-                       && !($minoredit && $wgUser->isAllowed('nominornewtalk') ) ) {
-                       if (wfRunHooks('ArticleEditUpdateNewTalk', array(&$this)) ) {
-                               $other = User::newFromName( $shortTitle );
-                               if( is_null( $other ) && User::isIP( $shortTitle ) ) {
+               if ( $this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getTitleKey() && $changed
+                       && !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) )
+               ) {
+                       if ( wfRunHooks( 'ArticleEditUpdateNewTalk', array( &$this ) ) ) {
+                               $other = User::newFromName( $shortTitle, false );
+                               if ( !$other ) {
+                                       wfDebug( __METHOD__ . ": invalid username\n" );
+                               } elseif ( User::isIP( $shortTitle ) ) {
                                        // An anonymous user
-                                       $other = new User();
-                                       $other->setName( $shortTitle );
-                               }
-                               if( $other ) {
                                        $other->setNewtalk( true );
+                               } elseif ( $other->isLoggedIn() ) {
+                                       $other->setNewtalk( true );
+                               } else {
+                                       wfDebug( __METHOD__ . ": don't need to notify a nonexistent user\n" );
                                }
                        }
                }
@@ -2461,13 +3709,13 @@ class Article {
        /**
         * Perform article updates on a special page creation.
         *
-        * @param Revision $rev
+        * @param $rev Revision object
         *
         * @todo This is a shitty interface function. Kill it and replace the
         * other shitty functions like editUpdates and such so it's not needed
         * anymore.
         */
-       function createUpdates( $rev ) {
+       public function createUpdates( $rev ) {
                $this->mGoodAdjustment = $this->isCountable( $rev->getText() );
                $this->mTotalAdjustment = 1;
                $this->editUpdates( $rev->getText(), $rev->getComment(),
@@ -2480,51 +3728,142 @@ class Article {
         *   Revision as of \<date\>; view current revision
         *   \<- Previous version | Next Version -\>
         *
-        * @private
-        * @param string $oldid         Revision ID of this article revision
+        * @param $oldid String: revision ID of this article revision
         */
-       function setOldSubtitle( $oldid=0 ) {
-               global $wgLang, $wgOut, $wgUser;
+       public function setOldSubtitle( $oldid = 0 ) {
+               global $wgLang, $wgOut, $wgUser, $wgRequest;
 
-               if ( !wfRunHooks( 'DisplayOldSubtitle', array(&$this, &$oldid) ) ) {
-                               return;
+               if ( !wfRunHooks( 'DisplayOldSubtitle', array( &$this, &$oldid ) ) ) {
+                       return;
+               }
+
+               $unhide = $wgRequest->getInt( 'unhide' ) == 1;
+
+               # Cascade unhide param in links for easy deletion browsing
+               $extraParams = array();
+               if ( $wgRequest->getVal( 'unhide' ) ) {
+                       $extraParams['unhide'] = 1;
                }
 
                $revision = Revision::newFromId( $oldid );
 
                $current = ( $oldid == $this->mLatest );
                $td = $wgLang->timeanddate( $this->mTimestamp, true );
+               $tddate = $wgLang->date( $this->mTimestamp, true );
+               $tdtime = $wgLang->time( $this->mTimestamp, true );
                $sk = $wgUser->getSkin();
                $lnk = $current
-                       ? wfMsg( 'currentrevisionlink' )
-                       : $lnk = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'currentrevisionlink' ) );
+                       ? wfMsgHtml( 'currentrevisionlink' )
+                       : $sk->link(
+                               $this->mTitle,
+                               wfMsgHtml( 'currentrevisionlink' ),
+                               array(),
+                               $extraParams,
+                               array( 'known', 'noclasses' )
+                       );
                $curdiff = $current
-                       ? wfMsg( 'diff' )
-                       : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=cur&oldid='.$oldid );
+                       ? wfMsgHtml( 'diff' )
+                       : $sk->link(
+                               $this->mTitle,
+                               wfMsgHtml( 'diff' ),
+                               array(),
+                               array(
+                                       'diff' => 'cur',
+                                       'oldid' => $oldid
+                               ) + $extraParams,
+                               array( 'known', 'noclasses' )
+                       );
                $prev = $this->mTitle->getPreviousRevisionID( $oldid ) ;
                $prevlink = $prev
-                       ? $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid )
-                       : wfMsg( 'previousrevision' );
+                       ? $sk->link(
+                               $this->mTitle,
+                               wfMsgHtml( 'previousrevision' ),
+                               array(),
+                               array(
+                                       'direction' => 'prev',
+                                       'oldid' => $oldid
+                               ) + $extraParams,
+                               array( 'known', 'noclasses' )
+                       )
+                       : wfMsgHtml( 'previousrevision' );
                $prevdiff = $prev
-                       ? $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=prev&oldid='.$oldid )
-                       : wfMsg( 'diff' );
+                       ? $sk->link(
+                               $this->mTitle,
+                               wfMsgHtml( 'diff' ),
+                               array(),
+                               array(
+                                       'diff' => 'prev',
+                                       'oldid' => $oldid
+                               ) + $extraParams,
+                               array( 'known', 'noclasses' )
+                       )
+                       : wfMsgHtml( 'diff' );
                $nextlink = $current
-                       ? wfMsg( 'nextrevision' )
-                       : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
+                       ? wfMsgHtml( 'nextrevision' )
+                       : $sk->link(
+                               $this->mTitle,
+                               wfMsgHtml( 'nextrevision' ),
+                               array(),
+                               array(
+                                       'direction' => 'next',
+                                       'oldid' => $oldid
+                               ) + $extraParams,
+                               array( 'known', 'noclasses' )
+                       );
                $nextdiff = $current
-                       ? wfMsg( 'diff' )
-                       : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=next&oldid='.$oldid );
+                       ? wfMsgHtml( 'diff' )
+                       : $sk->link(
+                               $this->mTitle,
+                               wfMsgHtml( 'diff' ),
+                               array(),
+                               array(
+                                       'diff' => 'next',
+                                       'oldid' => $oldid
+                               ) + $extraParams,
+                               array( 'known', 'noclasses' )
+                       );
 
-               $userlinks = $sk->userLink( $revision->getUser(), $revision->getUserText() )
-                                               . $sk->userToolLinks( $revision->getUser(), $revision->getUserText() );
+               $cdel = '';
+
+               // User can delete revisions or view deleted revisions...
+               $canHide = $wgUser->isAllowed( 'deleterevision' );
+               if ( $canHide || ( $revision->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) {
+                       if ( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) {
+                               $cdel = $sk->revDeleteLinkDisabled( $canHide ); // rev was hidden from Sysops
+                       } else {
+                               $query = array(
+                                       'type'   => 'revision',
+                                       'target' => $this->mTitle->getPrefixedDbkey(),
+                                       'ids'    => $oldid
+                               );
+                               $cdel = $sk->revDeleteLink( $query, $revision->isDeleted( File::DELETED_RESTRICTED ), $canHide );
+                       }
+                       $cdel .= ' ';
+               }
+
+               # Show user links if allowed to see them. If hidden, then show them only if requested...
+               $userlinks = $sk->revUserTools( $revision, !$unhide );
 
                $m = wfMsg( 'revision-info-current' );
                $infomsg = $current && !wfEmptyMsg( 'revision-info-current', $m ) && $m != '-'
                        ? 'revision-info-current'
                        : 'revision-info';
-                       
-               $r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" . wfMsg( $infomsg, $td, $userlinks ) . "</div>\n" .
-                    "\n\t\t\t\t<div id=\"mw-revision-nav\">" . wfMsg( 'revision-nav', $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t";
+
+               $r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" .
+                       wfMsgExt(
+                               $infomsg,
+                               array( 'parseinline', 'replaceafter' ),
+                               $td,
+                               $userlinks,
+                               $revision->getID(),
+                               $tddate,
+                               $tdtime,
+                               $revision->getUser()
+                       ) .
+                       "</div>\n" .
+                       "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsgExt( 'revision-nav', array( 'escapenoentities', 'parsemag', 'replaceafter' ),
+                       $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t";
+
                $wgOut->setSubtitle( $r );
        }
 
@@ -2532,10 +3871,13 @@ class Article {
         * This function is called right before saving the wikitext,
         * so we can do things like signatures and links-in-context.
         *
-        * @param string $text
+        * @param $text String article contents
+        * @return string article contents with altered wikitext markup (signatures
+        *      converted, {{subst:}}, templates, etc.)
         */
-       function preSaveTransform( $text ) {
+       public function preSaveTransform( $text ) {
                global $wgParser, $wgUser;
+
                return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) );
        }
 
@@ -2545,66 +3887,48 @@ class Article {
         * checkLastModified returns true if it has taken care of all
         * output to the client that is necessary for this request.
         * (that is, it has sent a cached version of the page)
+        *
+        * @return boolean true if cached version send, false otherwise
         */
-       function tryFileCache() {
+       protected function tryFileCache() {
                static $called = false;
-               if( $called ) {
+
+               if ( $called ) {
                        wfDebug( "Article::tryFileCache(): called twice!?\n" );
-                       return;
+                       return false;
                }
+
                $called = true;
-               if($this->isFileCacheable()) {
-                       $touched = $this->mTouched;
+               if ( $this->isFileCacheable() ) {
                        $cache = new HTMLFileCache( $this->mTitle );
-                       if($cache->isFileCacheGood( $touched )) {
+                       if ( $cache->isFileCacheGood( $this->mTouched ) ) {
                                wfDebug( "Article::tryFileCache(): about to load file\n" );
                                $cache->loadFromFileCache();
                                return true;
                        } else {
                                wfDebug( "Article::tryFileCache(): starting buffer\n" );
-                               ob_start( array(&$cache, 'saveToFileCache' ) );
+                               ob_start( array( &$cache, 'saveToFileCache' ) );
                        }
                } else {
                        wfDebug( "Article::tryFileCache(): not cacheable\n" );
                }
+
+               return false;
        }
 
        /**
         * Check if the page can be cached
         * @return bool
         */
-       function isFileCacheable() {
-               global $wgUser, $wgUseFileCache, $wgShowIPinHeader, $wgRequest, $wgLang, $wgContLang;
-               $action    = $wgRequest->getVal( 'action'    );
-               $oldid     = $wgRequest->getVal( 'oldid'     );
-               $diff      = $wgRequest->getVal( 'diff'      );
-               $redirect  = $wgRequest->getVal( 'redirect'  );
-               $printable = $wgRequest->getVal( 'printable' );
-               $page      = $wgRequest->getVal( 'page' );
-
-               //check for non-standard user language; this covers uselang, 
-               //and extensions for auto-detecting user language.
-               $ulang     = $wgLang->getCode(); 
-               $clang     = $wgContLang->getCode();
-
-               $cacheable = $wgUseFileCache
-                       && (!$wgShowIPinHeader)
-                       && ($this->getID() != 0)
-                       && ($wgUser->isAnon())
-                       && (!$wgUser->getNewtalk())
-                       && ($this->mTitle->getNamespace() != NS_SPECIAL )
-                       && (empty( $action ) || $action == 'view')
-                       && (!isset($oldid))
-                       && (!isset($diff))
-                       && (!isset($redirect))
-                       && (!isset($printable))
-                       && !isset($page)
-                       && (!$this->mRedirectedFrom)
-                       && ($ulang === $clang);
-
-               if ( $cacheable ) {
-                       //extension may have reason to disable file caching on some pages.
-                       $cacheable = wfRunHooks( 'IsFileCacheable', array( $this ) );
+       public function isFileCacheable() {
+               $cacheable = false;
+
+               if ( HTMLFileCache::useFileCache() ) {
+                       $cacheable = $this->getID() && !$this->mRedirectedFrom && !$this->mTitle->isRedirect();
+                       // Extension may have reason to disable file caching on some pages.
+                       if ( $cacheable ) {
+                               $cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) );
+                       }
                }
 
                return $cacheable;
@@ -2612,34 +3936,38 @@ class Article {
 
        /**
         * Loads page_touched and returns a value indicating if it should be used
-        *
+        * @return boolean true if not a redirect
         */
-       function checkTouched() {
-               if( !$this->mDataLoaded ) {
+       public function checkTouched() {
+               if ( !$this->mDataLoaded ) {
                        $this->loadPageData();
                }
+
                return !$this->mIsRedirect;
        }
 
        /**
         * Get the page_touched field
+        * @return string containing GMT timestamp
         */
-       function getTouched() {
-               # Ensure that page data has been loaded
-               if( !$this->mDataLoaded ) {
+       public function getTouched() {
+               if ( !$this->mDataLoaded ) {
                        $this->loadPageData();
                }
+
                return $this->mTouched;
        }
 
        /**
         * Get the page_latest field
+        * @return integer rev_id of current revision
         */
-       function getLatest() {
+       public function getLatest() {
                if ( !$this->mDataLoaded ) {
                        $this->loadPageData();
                }
-               return $this->mLatest;
+
+               return (int)$this->mLatest;
        }
 
        /**
@@ -2647,15 +3975,14 @@ class Article {
         * The article must already exist; link tables etc
         * are not updated, caches are not flushed.
         *
-        * @param string $text text submitted
-        * @param string $comment comment submitted
-        * @param bool $minor whereas it's a minor modification
+        * @param $text String: text submitted
+        * @param $comment String: comment submitted
+        * @param $minor Boolean: whereas it's a minor modification
         */
-       function quickEdit( $text, $comment = '', $minor = 0 ) {
+       public function quickEdit( $text, $comment = '', $minor = 0 ) {
                wfProfileIn( __METHOD__ );
 
                $dbw = wfGetDB( DB_MASTER );
-               $dbw->begin();
                $revision = new Revision( array(
                        'page'       => $this->getId(),
                        'text'       => $text,
@@ -2664,7 +3991,9 @@ class Article {
                        ) );
                $revision->insertOn( $dbw );
                $this->updateRevisionOn( $dbw, $revision );
-               $dbw->commit();
+
+               global $wgUser;
+               wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $wgUser ) );
 
                wfProfileOut( __METHOD__ );
        }
@@ -2672,20 +4001,22 @@ class Article {
        /**
         * Used to increment the view counter
         *
-        * @static
-        * @param integer $id article id
+        * @param $id Integer: article id
         */
-       function incViewCount( $id ) {
+       public static function incViewCount( $id ) {
                $id = intval( $id );
-               global $wgHitcounterUpdateFreq, $wgDBtype;
+
+               global $wgHitcounterUpdateFreq;
 
                $dbw = wfGetDB( DB_MASTER );
                $pageTable = $dbw->tableName( 'page' );
                $hitcounterTable = $dbw->tableName( 'hitcounter' );
                $acchitsTable = $dbw->tableName( 'acchits' );
+               $dbType = $dbw->getType();
 
-               if( $wgHitcounterUpdateFreq <= 1 ) {
+               if ( $wgHitcounterUpdateFreq <= 1 || $dbType == 'sqlite' ) {
                        $dbw->query( "UPDATE $pageTable SET page_counter = page_counter + 1 WHERE page_id = $id" );
+
                        return;
                }
 
@@ -2694,41 +4025,43 @@ class Article {
 
                $dbw->query( "INSERT INTO $hitcounterTable (hc_id) VALUES ({$id})" );
 
-               $checkfreq = intval( $wgHitcounterUpdateFreq/25 + 1 );
-               if( (rand() % $checkfreq != 0) or ($dbw->lastErrno() != 0) ){
+               $checkfreq = intval( $wgHitcounterUpdateFreq / 25 + 1 );
+               if ( ( rand() % $checkfreq != 0 ) or ( $dbw->lastErrno() != 0 ) ) {
                        # Most of the time (or on SQL errors), skip row count check
                        $dbw->ignoreErrors( $oldignore );
+
                        return;
                }
 
-               $res = $dbw->query("SELECT COUNT(*) as n FROM $hitcounterTable");
+               $res = $dbw->query( "SELECT COUNT(*) as n FROM $hitcounterTable" );
                $row = $dbw->fetchObject( $res );
                $rown = intval( $row->n );
-               if( $rown >= $wgHitcounterUpdateFreq ){
+
+               if ( $rown >= $wgHitcounterUpdateFreq ) {
                        wfProfileIn( 'Article::incViewCount-collect' );
                        $old_user_abort = ignore_user_abort( true );
 
-                       if ($wgDBtype == 'mysql')
-                               $dbw->query("LOCK TABLES $hitcounterTable WRITE");
-                       $tabletype = $wgDBtype == 'mysql' ? "ENGINE=HEAP " : '';
-                       $dbw->query("CREATE TEMPORARY TABLE $acchitsTable $tabletype AS ".
-                               "SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable ".
-                               'GROUP BY hc_id');
-                       $dbw->query("DELETE FROM $hitcounterTable");
-                       if ($wgDBtype == 'mysql') {
-                               $dbw->query('UNLOCK TABLES');
-                               $dbw->query("UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n ".
-                                       'WHERE page_id = hc_id');
-                       }
-                       else {
-                               $dbw->query("UPDATE $pageTable SET page_counter=page_counter + hc_n ".
-                                       "FROM $acchitsTable WHERE page_id = hc_id");
+                       $dbw->lockTables( array(), array( 'hitcounter' ), __METHOD__, false );
+                       $tabletype = $dbType == 'mysql' ? "ENGINE=HEAP " : '';
+                       $dbw->query( "CREATE TEMPORARY TABLE $acchitsTable $tabletype AS " .
+                               "SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable " .
+                               'GROUP BY hc_id', __METHOD__ );
+                       $dbw->delete( 'hitcounter', '*', __METHOD__ );
+                       $dbw->unlockTables( __METHOD__ );
+
+                       if ( $dbType == 'mysql' ) {
+                               $dbw->query( "UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n " .
+                                       'WHERE page_id = hc_id', __METHOD__ );
+                       } else {
+                               $dbw->query( "UPDATE $pageTable SET page_counter=page_counter + hc_n " .
+                                       "FROM $acchitsTable WHERE page_id = hc_id", __METHOD__ );
                        }
-                       $dbw->query("DROP TABLE $acchitsTable");
+                       $dbw->query( "DROP TABLE $acchitsTable", __METHOD__ );
 
                        ignore_user_abort( $old_user_abort );
                        wfProfileOut( 'Article::incViewCount-collect' );
                }
+
                $dbw->ignoreErrors( $oldignore );
        }
 
@@ -2740,70 +4073,106 @@ class Article {
         * This is a good place to put code to clear caches, for instance.
         *
         * This is called on page move and undelete, as well as edit
-        * @static
-        * @param $title_obj a title object
+        *
+        * @param $title a title object
         */
-
-       static function onArticleCreate($title) {
-               # The talk page isn't in the regular link tables, so we need to update manually:
+       public static function onArticleCreate( $title ) {
+               # Update existence markers on article/talk tabs...
                if ( $title->isTalkPage() ) {
                        $other = $title->getSubjectPage();
                } else {
                        $other = $title->getTalkPage();
                }
+
                $other->invalidateCache();
                $other->purgeSquid();
 
                $title->touchLinks();
                $title->purgeSquid();
+               $title->deleteTitleProtection();
        }
 
-       static function onArticleDelete( $title ) {
-               global $wgUseFileCache, $wgMessageCache;
+       /**
+        * Clears caches when article is deleted
+        */
+       public static function onArticleDelete( $title ) {
+               global $wgMessageCache;
+
+               # Update existence markers on article/talk tabs...
+               if ( $title->isTalkPage() ) {
+                       $other = $title->getSubjectPage();
+               } else {
+                       $other = $title->getTalkPage();
+               }
+
+               $other->invalidateCache();
+               $other->purgeSquid();
 
                $title->touchLinks();
                $title->purgeSquid();
 
                # File cache
-               if ( $wgUseFileCache ) {
-                       $cm = new HTMLFileCache( $title );
-                       @unlink( $cm->fileCacheName() );
-               }
+               HTMLFileCache::clearFileCache( $title );
 
-               if( $title->getNamespace() == NS_MEDIAWIKI) {
+               # Messages
+               if ( $title->getNamespace() == NS_MEDIAWIKI ) {
                        $wgMessageCache->replace( $title->getDBkey(), false );
                }
+
+               # Images
+               if ( $title->getNamespace() == NS_FILE ) {
+                       $update = new HTMLCacheUpdate( $title, 'imagelinks' );
+                       $update->doUpdate();
+               }
+
+               # User talk pages
+               if ( $title->getNamespace() == NS_USER_TALK ) {
+                       $user = User::newFromName( $title->getText(), false );
+                       $user->setNewtalk( false );
+               }
+
+               # Image redirects
+               RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $title );
        }
 
        /**
         * Purge caches on page update etc
+        *
+        * @param $title Title object
+        * @todo:  verify that $title is always a Title object (and never false or null), add Title hint to parameter $title
         */
-       static function onArticleEdit( $title ) {
-               global $wgDeferredUpdateList, $wgUseFileCache;
+       public static function onArticleEdit( $title ) {
+               global $wgDeferredUpdateList;
 
                // Invalidate caches of articles which include this page
-               $update = new HTMLCacheUpdate( $title, 'templatelinks' );
-               $wgDeferredUpdateList[] = $update;
+               $wgDeferredUpdateList[] = new HTMLCacheUpdate( $title, 'templatelinks' );
+
+               // Invalidate the caches of all pages which redirect here
+               $wgDeferredUpdateList[] = new HTMLCacheUpdate( $title, 'redirect' );
 
                # Purge squid for this page only
                $title->purgeSquid();
 
-               # Clear file cache
-               if ( $wgUseFileCache ) {
-                       $cm = new HTMLFileCache( $title );
-                       @unlink( $cm->fileCacheName() );
-               }
+               # Clear file cache for this page only
+               HTMLFileCache::clearFileCache( $title );
        }
 
        /**#@-*/
 
+       /**
+        * Overriden by ImagePage class, only present here to avoid a fatal error
+        * Called for ?action=revert
+        */
+       public function revert() {
+               global $wgOut;
+               $wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
+       }
+
        /**
         * Info about this page
         * Called for ?action=info when $wgAllowPageInfo is on.
-        *
-        * @public
         */
-       function info() {
+       public function info() {
                global $wgLang, $wgOut, $wgAllowPageInfo, $wgUser;
 
                if ( !$wgAllowPageInfo ) {
@@ -2815,21 +4184,22 @@ class Article {
 
                $wgOut->setPagetitle( $page->getPrefixedText() );
                $wgOut->setPageTitleActionText( wfMsg( 'info_short' ) );
-               $wgOut->setSubtitle( wfMsg( 'infosubtitle' ) );
+               $wgOut->setSubtitle( wfMsgHtml( 'infosubtitle' ) );
 
-               if( !$this->mTitle->exists() ) {
-                       $wgOut->addHtml( '<div class="noarticletext">' );
-                       if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+               if ( !$this->mTitle->exists() ) {
+                       $wgOut->addHTML( '<div class="noarticletext">' );
+                       if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
                                // This doesn't quite make sense; the user is asking for
                                // information about the _page_, not the message... -- RC
-                               $wgOut->addHtml( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) );
+                               $wgOut->addHTML( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) );
                        } else {
                                $msg = $wgUser->isLoggedIn()
                                        ? 'noarticletext'
                                        : 'noarticletextanon';
-                               $wgOut->addHtml( wfMsgExt( $msg, 'parse' ) );
+                               $wgOut->addHTML( wfMsgExt( $msg, 'parse' ) );
                        }
-                       $wgOut->addHtml( '</div>' );
+
+                       $wgOut->addHTML( '</div>' );
                } else {
                        $dbr = wfGetDB( DB_SLAVE );
                        $wl_clause = array(
@@ -2845,17 +4215,22 @@ class Article {
                        $pageInfo = $this->pageCountInfo( $page );
                        $talkInfo = $this->pageCountInfo( $page->getTalkPage() );
 
-                       $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' );
-                       $wgOut->addHTML( "<li>" . wfMsg('numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>');
-                       if( $talkInfo ) {
-                               $wgOut->addHTML( '<li>' . wfMsg("numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '</li>');
+
+                       //FIXME: unescaped messages
+                       $wgOut->addHTML( "<ul><li>" . wfMsg( "numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' );
+                       $wgOut->addHTML( "<li>" . wfMsg( 'numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>' );
+
+                       if ( $talkInfo ) {
+                               $wgOut->addHTML( '<li>' . wfMsg( "numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '</li>' );
                        }
-                       $wgOut->addHTML( '<li>' . wfMsg("numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '</li>' );
-                       if( $talkInfo ) {
-                               $wgOut->addHTML( '<li>' . wfMsg('numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '</li>' );
+
+                       $wgOut->addHTML( '<li>' . wfMsg( "numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '</li>' );
+
+                       if ( $talkInfo ) {
+                               $wgOut->addHTML( '<li>' . wfMsg( 'numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '</li>' );
                        }
-                       $wgOut->addHTML( '</ul>' );
 
+                       $wgOut->addHTML( '</ul>' );
                }
        }
 
@@ -2863,33 +4238,32 @@ class Article {
         * Return the total number of edits and number of unique editors
         * on a given page. If page does not exist, returns false.
         *
-        * @param Title $title
-        * @return array
-        * @private
+        * @param $title Title object
+        * @return mixed array or boolean false
         */
-       function pageCountInfo( $title ) {
+       public function pageCountInfo( $title ) {
                $id = $title->getArticleId();
-               if( $id == 0 ) {
+
+               if ( $id == 0 ) {
                        return false;
                }
 
                $dbr = wfGetDB( DB_SLAVE );
-
                $rev_clause = array( 'rev_page' => $id );
-
                $edits = $dbr->selectField(
                        'revision',
                        'COUNT(rev_page)',
                        $rev_clause,
                        __METHOD__,
-                       $this->getSelectOptions() );
-
+                       $this->getSelectOptions()
+               );
                $authors = $dbr->selectField(
                        'revision',
                        'COUNT(DISTINCT rev_user_text)',
                        $rev_clause,
                        __METHOD__,
-                       $this->getSelectOptions() );
+                       $this->getSelectOptions()
+               );
 
                return array( 'edits' => $edits, 'authors' => $authors );
        }
@@ -2898,12 +4272,13 @@ class Article {
         * Return a list of templates used by this article.
         * Uses the templatelinks table
         *
-        * @return array Array of Title objects
+        * @return Array of Title objects
         */
-       function getUsedTemplates() {
+       public function getUsedTemplates() {
                $result = array();
                $id = $this->mTitle->getArticleID();
-               if( $id == 0 ) {
+
+               if ( $id == 0 ) {
                        return array();
                }
 
@@ -2911,93 +4286,94 @@ class Article {
                $res = $dbr->select( array( 'templatelinks' ),
                        array( 'tl_namespace', 'tl_title' ),
                        array( 'tl_from' => $id ),
-                       'Article:getUsedTemplates' );
-               if ( false !== $res ) {
-                       if ( $dbr->numRows( $res ) ) {
-                               while ( $row = $dbr->fetchObject( $res ) ) {
-                                       $result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title );
-                               }
+                       __METHOD__ );
+
+               if ( $res !== false ) {
+                       foreach ( $res as $row ) {
+                               $result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title );
                        }
                }
-               $dbr->freeResult( $res );
+
                return $result;
        }
 
        /**
-        * Return an auto-generated summary if the text provided is a redirect.
+        * Returns a list of hidden categories this page is a member of.
+        * Uses the page_props and categorylinks tables.
         *
-        * @param  string $text The wikitext to check
-        * @return string '' or an appropriate summary
+        * @return Array of Title objects
         */
-       public static function getRedirectAutosummary( $text ) {
-               $rt = Title::newFromRedirect( $text );
-               if( is_object( $rt ) )
-                       return wfMsgForContent( 'autoredircomment', $rt->getFullText() );
-               else
-                       return '';
-       }
+       public function getHiddenCategories() {
+               $result = array();
+               $id = $this->mTitle->getArticleID();
 
-       /**
-        * Return an auto-generated summary if the new text is much shorter than
-        * the old text.
-        *
-        * @param  string $oldtext The previous text of the page
-        * @param  string $text    The submitted text of the page
-        * @return string An appropriate autosummary, or an empty string.
-        */
-       public static function getBlankingAutosummary( $oldtext, $text ) {
-               if ($oldtext!='' && $text=='') {
-                       return wfMsgForContent('autosumm-blank');
-               } elseif (strlen($oldtext) > 10 * strlen($text) && strlen($text) < 500) {
-                       #Removing more than 90% of the article
-                       global $wgContLang;
-                       $truncatedtext = $wgContLang->truncate($text, max(0, 200 - strlen(wfMsgForContent('autosumm-replace'))), '...');
-                       return wfMsgForContent('autosumm-replace', $truncatedtext);
-               } else {
-                       return '';
+               if ( $id == 0 ) {
+                       return array();
                }
+
+               $dbr = wfGetDB( DB_SLAVE );
+               $res = $dbr->select( array( 'categorylinks', 'page_props', 'page' ),
+                       array( 'cl_to' ),
+                       array( 'cl_from' => $id, 'pp_page=page_id', 'pp_propname' => 'hiddencat',
+                               'page_namespace' => NS_CATEGORY, 'page_title=cl_to' ),
+                       __METHOD__ );
+
+               if ( $res !== false ) {
+                       foreach ( $res as $row ) {
+                               $result[] = Title::makeTitle( NS_CATEGORY, $row->cl_to );
+                       }
+               }
+
+               return $result;
        }
 
        /**
        * Return an applicable autosummary if one exists for the given edit.
-       * @param string $oldtext The previous text of the page.
-       * @param string $newtext The submitted text of the page.
-       * @param bitmask $flags A bitmask of flags submitted for the edit.
+       * @param $oldtext String: the previous text of the page.
+       * @param $newtext String: The submitted text of the page.
+       * @param $flags Bitmask: a bitmask of flags submitted for the edit.
        * @return string An appropriate autosummary, or an empty string.
        */
        public static function getAutosummary( $oldtext, $newtext, $flags ) {
+               global $wgContLang;
+               
+               # Decide what kind of autosummary is needed.
+
+               # Redirect autosummaries
+               $ot = Title::newFromRedirect( $oldtext );
+               $rt = Title::newFromRedirect( $newtext );
 
-               # This code is UGLY UGLY UGLY.
-               # Somebody PLEASE come up with a more elegant way to do it.
+               if ( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) {
+                       return wfMsgForContent( 'autoredircomment', $rt->getFullText() );
+               }
 
-               #Redirect autosummaries
-               $summary = self::getRedirectAutosummary( $newtext );
+               # New page autosummaries
+               if ( $flags & EDIT_NEW && strlen( $newtext ) ) {
+                       # If they're making a new article, give its text, truncated, in the summary.
 
-               if ($summary)
-                       return $summary;
+                       $truncatedtext = $wgContLang->truncate(
+                               str_replace( "\n", ' ', $newtext ),
+                               max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new' ) ) ) );
 
-               #Blanking autosummaries
-               if (!($flags & EDIT_NEW))
-                       $summary = self::getBlankingAutosummary( $oldtext, $newtext );
+                       return wfMsgForContent( 'autosumm-new', $truncatedtext );
+               }
 
-               if ($summary)
-                       return $summary;
+               # Blanking autosummaries
+               if ( $oldtext != '' && $newtext == '' ) {
+                       return wfMsgForContent( 'autosumm-blank' );
+               } elseif ( strlen( $oldtext ) > 10 * strlen( $newtext ) && strlen( $newtext ) < 500 ) {
+                       # Removing more than 90% of the article
 
-               #New page autosummaries
-               if ($flags & EDIT_NEW && strlen($newtext)) {
-                       #If they're making a new article, give its text, truncated, in the summary.
-                       global $wgContLang;
                        $truncatedtext = $wgContLang->truncate(
-                               str_replace("\n", ' ', $newtext),
-                               max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new') ) ),
-                               '...' );
-                       $summary = wfMsgForContent( 'autosumm-new', $truncatedtext );
-               }
+                               $newtext,
+                               max( 0, 200 - strlen( wfMsgForContent( 'autosumm-replace' ) ) ) );
 
-               if ($summary)
-                       return $summary;
+                       return wfMsgForContent( 'autosumm-replace', $truncatedtext );
+               }
 
-               return $summary;
+               # If we reach this point, there's no applicable autosummary for our case, so our
+               # autosummary is empty.
+               return '';
        }
 
        /**
@@ -3005,76 +4381,292 @@ class Article {
         * Saves the text into the parser cache if possible.
         * Updates templatelinks if it is out of date.
         *
-        * @param string  $text
-        * @param bool    $cache
+        * @param $text String
+        * @param $cache Boolean
+        * @param $parserOptions mixed ParserOptions object, or boolean false
         */
-       public function outputWikiText( $text, $cache = true ) {
-               global $wgParser, $wgUser, $wgOut;
+       public function outputWikiText( $text, $cache = true, $parserOptions = false ) {
+               global $wgOut;
+
+               $this->mParserOutput = $this->getOutputFromWikitext( $text, $cache, $parserOptions );
+               $wgOut->addParserOutput( $this->mParserOutput );
+       }
+
+       /**
+        * This does all the heavy lifting for outputWikitext, except it returns the parser
+        * output instead of sending it straight to $wgOut. Makes things nice and simple for,
+        * say, embedding thread pages within a discussion system (LiquidThreads)
+        *
+        * @param $text string
+        * @param $cache boolean
+        * @param $parserOptions parsing options, defaults to false
+        * @return string containing parsed output
+        */
+       public function getOutputFromWikitext( $text, $cache = true, $parserOptions = false ) {
+               global $wgParser, $wgEnableParserCache, $wgUseFileCache;
 
-               $popts = $wgOut->parserOptions();
-               $popts->setTidy(true);
-               $parserOutput = $wgParser->parse( $text, $this->mTitle,
-                       $popts, true, true, $this->getRevIdFetched() );
-               $popts->setTidy(false);
-               if ( $cache && $this && $parserOutput->getCacheTime() != -1 ) {
-                       $parserCache =& ParserCache::singleton();
-                       $parserCache->save( $parserOutput, $this, $wgUser );
+               if ( !$parserOptions ) {
+                       $parserOptions = $this->getParserOptions();
                }
 
-               if ( !wfReadOnly() && $this->mTitle->areRestrictionsCascading() ) {
-                       // templatelinks table may have become out of sync,
-                       // especially if using variable-based transclusions.
-                       // For paranoia, check if things have changed and if
-                       // so apply updates to the database. This will ensure
-                       // that cascaded protections apply as soon as the changes
-                       // are visible.
+               $time = - wfTime();
+               $this->mParserOutput = $wgParser->parse( $text, $this->mTitle,
+                       $parserOptions, true, true, $this->getRevIdFetched() );
+               $time += wfTime();
+
+               # Timing hack
+               if ( $time > 3 ) {
+                       wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time,
+                               $this->mTitle->getPrefixedDBkey() ) );
+               }
 
-                       # Get templates from templatelinks
-                       $id = $this->mTitle->getArticleID();
+               if ( $wgEnableParserCache && $cache && $this->mParserOutput->isCacheable() ) {
+                       $parserCache = ParserCache::singleton();
+                       $parserCache->save( $this->mParserOutput, $this, $parserOptions );
+               }
 
-                       $tlTemplates = array();
+               // Make sure file cache is not used on uncacheable content.
+               // Output that has magic words in it can still use the parser cache
+               // (if enabled), though it will generally expire sooner.
+               if ( !$this->mParserOutput->isCacheable() || $this->mParserOutput->containsOldMagic() ) {
+                       $wgUseFileCache = false;
+               }
 
-                       $dbr = wfGetDB( DB_SLAVE );
-                       $res = $dbr->select( array( 'templatelinks' ),
-                               array( 'tl_namespace', 'tl_title' ),
-                               array( 'tl_from' => $id ),
-                               'Article:getUsedTemplates' );
+               $this->doCascadeProtectionUpdates( $this->mParserOutput );
 
-                       global $wgContLang;
+               return $this->mParserOutput;
+       }
 
-                       if ( false !== $res ) {
-                               if ( $dbr->numRows( $res ) ) {
-                                       while ( $row = $dbr->fetchObject( $res ) ) {
-                                               $tlTemplates[] = $wgContLang->getNsText( $row->tl_namespace ) . ':' . $row->tl_title ;
-                                       }
-                               }
-                       }
+       /**
+        * Get parser options suitable for rendering the primary article wikitext
+        * @return mixed ParserOptions object or boolean false
+        */
+       public function getParserOptions() {
+               global $wgUser;
 
-                       # Get templates from parser output.
-                       $poTemplates_allns = $parserOutput->getTemplates();
+               if ( !$this->mParserOptions ) {
+                       $this->mParserOptions = new ParserOptions( $wgUser );
+                       $this->mParserOptions->setTidy( true );
+                       $this->mParserOptions->enableLimitReport();
+               }
 
-                       $poTemplates = array ();
-                       foreach ( $poTemplates_allns as $ns_templates ) {
-                               $poTemplates = array_merge( $poTemplates, $ns_templates );
-                       }
+               // Clone to allow modifications of the return value without affecting 
+               // the cache
+               return clone $this->mParserOptions;
+       }
 
-                       # Get the diff
-                       $templates_diff = array_diff( $poTemplates, $tlTemplates );
+       /**
+        * Updates cascading protections
+        *
+        * @param $parserOutput mixed ParserOptions object, or boolean false
+        **/
+       protected function doCascadeProtectionUpdates( $parserOutput ) {
+               if ( !$this->isCurrent() || wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) {
+                       return;
+               }
 
-                       if ( count( $templates_diff ) > 0 ) {
-                               # Whee, link updates time.
-                               $u = new LinksUpdate( $this->mTitle, $parserOutput );
+               // templatelinks table may have become out of sync,
+               // especially if using variable-based transclusions.
+               // For paranoia, check if things have changed and if
+               // so apply updates to the database. This will ensure
+               // that cascaded protections apply as soon as the changes
+               // are visible.
 
-                               $dbw = wfGetDb( DB_MASTER );
-                               $dbw->begin();
+               # Get templates from templatelinks
+               $id = $this->mTitle->getArticleID();
 
-                               $u->doUpdate();
+               $tlTemplates = array();
 
-                               $dbw->commit();
+               $dbr = wfGetDB( DB_SLAVE );
+               $res = $dbr->select( array( 'templatelinks' ),
+                       array( 'tl_namespace', 'tl_title' ),
+                       array( 'tl_from' => $id ),
+                       __METHOD__
+               );
+
+               foreach ( $res as $row ) {
+                       $tlTemplates["{$row->tl_namespace}:{$row->tl_title}"] = true;
+               }
+
+               # Get templates from parser output.
+               $poTemplates = array();
+               foreach ( $parserOutput->getTemplates() as $ns => $templates ) {
+                       foreach ( $templates as $dbk => $id ) {
+                               $poTemplates["$ns:$dbk"] = true;
                        }
                }
 
-               $wgOut->addParserOutput( $parserOutput );
+               # Get the diff
+               $templates_diff = array_diff_key( $poTemplates, $tlTemplates );
+
+               if ( count( $templates_diff ) > 0 ) {
+                       # Whee, link updates time.
+                       $u = new LinksUpdate( $this->mTitle, $parserOutput, false );
+                       $u->doUpdate();
+               }
+       }
+
+       /**
+        * Update all the appropriate counts in the category table, given that
+        * we've added the categories $added and deleted the categories $deleted.
+        *
+        * @param $added array   The names of categories that were added
+        * @param $deleted array The names of categories that were deleted
+        */
+       public function updateCategoryCounts( $added, $deleted ) {
+               $ns = $this->mTitle->getNamespace();
+               $dbw = wfGetDB( DB_MASTER );
+
+               # First make sure the rows exist.  If one of the "deleted" ones didn't
+               # exist, we might legitimately not create it, but it's simpler to just
+               # create it and then give it a negative value, since the value is bogus
+               # anyway.
+               #
+               # Sometimes I wish we had INSERT ... ON DUPLICATE KEY UPDATE.
+               $insertCats = array_merge( $added, $deleted );
+               if ( !$insertCats ) {
+                       # Okay, nothing to do
+                       return;
+               }
+
+               $insertRows = array();
+
+               foreach ( $insertCats as $cat ) {
+                       $insertRows[] = array(
+                               'cat_id' => $dbw->nextSequenceValue( 'category_cat_id_seq' ),
+                               'cat_title' => $cat
+                       );
+               }
+               $dbw->insert( 'category', $insertRows, __METHOD__, 'IGNORE' );
+
+               $addFields    = array( 'cat_pages = cat_pages + 1' );
+               $removeFields = array( 'cat_pages = cat_pages - 1' );
+
+               if ( $ns == NS_CATEGORY ) {
+                       $addFields[]    = 'cat_subcats = cat_subcats + 1';
+                       $removeFields[] = 'cat_subcats = cat_subcats - 1';
+               } elseif ( $ns == NS_FILE ) {
+                       $addFields[]    = 'cat_files = cat_files + 1';
+                       $removeFields[] = 'cat_files = cat_files - 1';
+               }
+
+               if ( $added ) {
+                       $dbw->update(
+                               'category',
+                               $addFields,
+                               array( 'cat_title' => $added ),
+                               __METHOD__
+                       );
+               }
+
+               if ( $deleted ) {
+                       $dbw->update(
+                               'category',
+                               $removeFields,
+                               array( 'cat_title' => $deleted ),
+                               __METHOD__
+                       );
+               }
+       }
+
+       /**
+        * Lightweight method to get the parser output for a page, checking the parser cache
+        * and so on. Doesn't consider most of the stuff that Article::view is forced to
+        * consider, so it's not appropriate to use there.
+        *
+        * @since 1.16 (r52326) for LiquidThreads
+        * 
+        * @param $oldid mixed integer Revision ID or null
+        */
+       public function getParserOutput( $oldid = null ) {
+               global $wgEnableParserCache, $wgUser;
+
+               // Should the parser cache be used?
+               $useParserCache = $wgEnableParserCache &&
+                       $wgUser->getStubThreshold() == 0 &&
+                       $this->exists() &&
+                       $oldid === null;
+
+               wfDebug( __METHOD__ . ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
+
+               if ( $wgUser->getStubThreshold() ) {
+                       wfIncrStats( 'pcache_miss_stub' );
+               }
+
+               $parserOutput = false;
+               if ( $useParserCache ) {
+                       $parserOutput = ParserCache::singleton()->get( $this, $this->getParserOptions() );
+               }
+
+               if ( $parserOutput === false ) {
+                       // Cache miss; parse and output it.
+                       $rev = Revision::newFromTitle( $this->getTitle(), $oldid );
+
+                       return $this->getOutputFromWikitext( $rev->getText(), $useParserCache );
+               } else {
+                       return $parserOutput;
+               }
+       }
+
+       // Deprecated methods
+       /**
+        * Get the database which should be used for reads
+        *
+        * @return Database
+        * @deprecated - just call wfGetDB( DB_MASTER ) instead
+        */
+       function getDB() {
+               wfDeprecated( __METHOD__ );
+               return wfGetDB( DB_MASTER );
+       }
+
+}
+
+class PoolWorkArticleView extends PoolCounterWork {
+       private $mArticle;
+       
+       function __construct( $article, $key, $useParserCache, $parserOptions ) {
+               parent::__construct( 'ArticleView', $key );
+               $this->mArticle = $article;
+               $this->cacheable = $useParserCache;
+               $this->parserOptions = $parserOptions;
+       }
+       
+       function doWork() {
+               return $this->mArticle->doViewParse();
        }
+       
+       function getCachedWork() {
+               global $wgOut;
+               
+               $parserCache = ParserCache::singleton();
+               $this->mArticle->mParserOutput = $parserCache->get( $this->mArticle, $this->parserOptions );
+
+               if ( $this->mArticle->mParserOutput !== false ) {
+                       wfDebug( __METHOD__ . ": showing contents parsed by someone else\n" );
+                       $wgOut->addParserOutput( $this->mArticle->mParserOutput );
+                       # Ensure that UI elements requiring revision ID have
+                       # the correct version information.
+                       $wgOut->setRevisionId( $this->mArticle->getLatest() );
+                       return true;
+               }
+               return false;
+       }
+       
+       function fallback() {
+               return $this->mArticle->tryDirtyCache();
+       }
+       
+       function error( $status ) {
+               global $wgOut;
 
+               $wgOut->clearHTML(); // for release() errors
+               $wgOut->enableClientCache( false );
+               $wgOut->setRobotPolicy( 'noindex,nofollow' );
+               
+               $errortext = $status->getWikiText( false, 'view-pool-error' );
+               $wgOut->addWikiText( '<div class="errorbox">' . $errortext . '</div>' );
+               
+               return false;
+       }
 }