Add support for Number grouping(commafy) based on CLDR number grouping patterns like...
[lhc/web/wiklou.git] / includes / Article.php
index b9288c2..a91ad26 100644 (file)
@@ -5,7 +5,11 @@
  */
 
 /**
- * Class representing a MediaWiki article and history.
+ * Class for viewing MediaWiki article and history.
+ *
+ * This maintains WikiPage functions for backwards compatibility.
+ *
+ * @TODO: move and rewrite code to an Action class
  *
  * See design.txt for an overview.
  * Note: edit user interface and cache support functions have been
  *
  * @internal documentation reviewed 15 Mar 2010
  */
-class Article {
+class Article extends Page {
        /**@{{
         * @private
         */
-       protected $mContext;              // !< RequestContext
+
+       /**
+        * @var IContextSource
+        */
+       protected $mContext;
+
+       /**
+        * @var WikiPage
+        */
+       protected $mPage;
 
        var $mContent;                    // !<
        var $mContentLoaded = false;      // !<
-       var $mCounter = -1;               // !< Not loaded
-       var $mDataLoaded = false;         // !<
-       var $mForUpdate = false;          // !<
-       var $mGoodAdjustment = 0;         // !<
-       var $mIsRedirect = false;         // !<
-       var $mLatest = false;             // !<
        var $mOldId;                      // !<
-       var $mPreparedEdit = false;       // !< Title object if set
-       var $mRedirectedFrom = null;      // !< Title object if set
-       var $mRedirectTarget = null;      // !< Title object if set
+
+       /**
+        * @var Title
+        */
+       var $mRedirectedFrom = null;
+
+       /**
+        * @var mixed: boolean false or URL string
+        */
        var $mRedirectUrl = false;        // !<
        var $mRevIdFetched = 0;           // !<
-       var $mLastRevision = null;                // !< Latest revision if set
-       var $mRevision = null;            // !< Loaded revision object if set
-       var $mTimestamp = '';             // !<
-       var $mTitle;                      // !< Title object
-       var $mTotalAdjustment = 0;        // !<
-       var $mTouched = '19700101000000'; // !<
-       var $mParserOptions;              // !< ParserOptions object
-       var $mParserOutput;               // !< ParserCache object if set
+
+       /**
+        * @var Revision
+        */
+       var $mRevision = null;
+
+       /**
+        * @var ParserOutput
+        */
+       var $mParserOutput;
+
        /**@}}*/
 
        /**
         * Constructor and clear the article
-        * @param $title Reference to a Title object.
+        * @param $title Title Reference to a Title object.
         * @param $oldId Integer revision ID, null to fetch from request, zero for current
         */
        public function __construct( Title $title, $oldId = null ) {
-               // FIXME: does the reference play any role here?
-               $this->mTitle =& $title;
                $this->mOldId = $oldId;
+               $this->mPage = $this->newPage( $title );
+       }
+
+       protected function newPage( Title $title ) {
+               return new WikiPage( $title );
        }
 
        /**
-        * Constructor from an page id
+        * Constructor from a page id
         * @param $id Int article ID to load
         */
        public static function newFromID( $id ) {
                $t = Title::newFromID( $id );
-               # FIXME: doesn't inherit right
+               # @todo FIXME: Doesn't inherit right
                return $t == null ? null : new self( $t );
                # return $t == null ? null : new static( $t ); // PHP 5.3
        }
 
        /**
-        * Tell the page view functions that this view was redirected
-        * from another page on the wiki.
-        * @param $from Title object.
-        */
-       public function setRedirectedFrom( Title $from ) {
-               $this->mRedirectedFrom = $from;
-       }
-
-       /**
-        * If this page is a redirect, get its target
+        * Create an Article object of the appropriate class for the given page.
         *
-        * 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
+        * @param $title Title
+        * @param $context IContextSource
+        * @return Article object
         */
-       public function getRedirectTarget() {
-               if ( !$this->mTitle->isRedirect() ) {
-                       return null;
+       public static function newFromTitle( $title, IContextSource $context ) {
+               if ( NS_MEDIA == $title->getNamespace() ) {
+                       // FIXME: where should this go?
+                       $title = Title::makeTitle( NS_FILE, $title->getDBkey() );
                }
 
-               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->getRawText() );
-               if ( !$retval ) {
-                       return null;
+               $page = null;
+               wfRunHooks( 'ArticleFromTitle', array( &$title, &$page ) );
+               if ( !$page ) {
+                       switch( $title->getNamespace() ) {
+                               case NS_FILE:
+                                       $page = new ImagePage( $title );
+                                       break;
+                               case NS_CATEGORY:
+                                       $page = new CategoryPage( $title );
+                                       break;
+                               default:
+                                       $page = new Article( $title );
+                       }
                }
-               $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
-        */
-       public function followRedirect() {
-               return $this->getRedirectURL( $this->getRedirectTarget() );
-       }
+               $page->setContext( $context );
 
-       /**
-        * 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 since 1.17
-        */
-       public function followRedirectText( $text ) {
-               // recurse through to only get the final target
-               return $this->getRedirectURL( Title::newFromRedirectRecurse( $text ) );
+               return $page;
        }
 
        /**
-        * 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
+        * Tell the page view functions that this view was redirected
+        * from another page on the wiki.
+        * @param $from Title object.
         */
-       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 ) {
-                                       // 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' ) ) {
-                                               // rolleyes
-                                       } else {
-                                               return $rt->getFullURL();
-                                       }
-                               }
-
-                               return $rt;
-                       }
-               }
-
-               // No or invalid redirect
-               return false;
+       public function setRedirectedFrom( Title $from ) {
+               $this->mRedirectedFrom = $from;
        }
 
        /**
@@ -210,31 +130,22 @@ class Article {
         * @return Title object of this page
         */
        public function getTitle() {
-               return $this->mTitle;
+               return $this->mPage->getTitle();
        }
 
        /**
         * Clear the object
-        * FIXME: shouldn't this be public?
+        * @todo FIXME: Shouldn't this be public?
         * @private
         */
        public function clear() {
-               $this->mDataLoaded    = false;
                $this->mContentLoaded = false;
 
-               $this->mCounter = -1; # Not loaded
                $this->mRedirectedFrom = null; # Title object if set
-               $this->mRedirectTarget = null; # Title object if set
-               $this->mLastRevision = null; # Latest revision
-               $this->mTimestamp = '';
-               $this->mGoodAdjustment = $this->mTotalAdjustment = 0;
-               $this->mTouched = '19700101000000';
-               $this->mForUpdate = false;
-               $this->mIsRedirect = false;
                $this->mRevIdFetched = 0;
                $this->mRedirectUrl = false;
-               $this->mLatest = false;
-               $this->mPreparedEdit = false;
+
+               $this->mPage->clear();
        }
 
        /**
@@ -252,11 +163,11 @@ class Article {
 
                wfProfileIn( __METHOD__ );
 
-               if ( $this->getID() === 0 ) {
+               if ( $this->mPage->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 ) {
-                               $text = $this->mTitle->getDefaultMessageText();
+                       if ( $this->getTitle()->getNamespace() == NS_MEDIAWIKI ) {
+                               $text = $this->getTitle()->getDefaultMessageText();
                                if ( $text === false ) {
                                        $text = '';
                                }
@@ -274,71 +185,6 @@ class Article {
                }
        }
 
-       /**
-        * 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;
-       }
-
-       /**
-        * This function returns the text of a section, specified by a number ($section).
-        * A section is text under a heading like == Heading == or \<h1\>Heading\</h1\>, or
-        * the first section before any such heading (section 0).
-        *
-        * If a section contains subsections, these are also returned.
-        *
-        * @param $text String: text to look in
-        * @param $section Integer: section number
-        * @return string text of the requested section
-        * @deprecated
-        */
-       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
@@ -366,14 +212,14 @@ class Article {
                if ( isset( $oldid ) ) {
                        $oldid = intval( $oldid );
                        if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
-                               $nextid = $this->mTitle->getNextRevisionID( $oldid );
+                               $nextid = $this->getTitle()->getNextRevisionID( $oldid );
                                if ( $nextid ) {
                                        $oldid = $nextid;
                                } else {
-                                       $this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' );
+                                       $this->mRedirectUrl = $this->getTitle()->getFullURL( 'redirect=no' );
                                }
                        } elseif ( $wgRequest->getVal( 'direction' ) == 'prev' ) {
-                               $previd = $this->mTitle->getPreviousRevisionID( $oldid );
+                               $previd = $this->getTitle()->getPreviousRevisionID( $oldid );
                                if ( $previd ) {
                                        $oldid = $previd;
                                }
@@ -402,103 +248,6 @@ class Article {
                wfProfileOut( __METHOD__ );
        }
 
-       /**
-        * Return the list of revision fields that should be selected to create
-        * a new page.
-        */
-       public static function selectFields() {
-               return array(
-                       'page_id',
-                       'page_namespace',
-                       'page_title',
-                       'page_restrictions',
-                       'page_counter',
-                       'page_is_redirect',
-                       'page_is_new',
-                       'page_random',
-                       'page_touched',
-                       'page_latest',
-                       'page_len',
-               );
-       }
-
-       /**
-        * Fetch a page record with the given conditions
-        * @param $dbr Database object
-        * @param $conditions Array
-        * @return mixed Database result resource, or false on failure
-        */
-       protected function pageData( $dbr, $conditions ) {
-               $fields = self::selectFields();
-
-               wfRunHooks( 'ArticlePageDataBefore', array( &$this, &$fields ) );
-
-               $row = $dbr->selectRow( 'page', $fields, $conditions, __METHOD__ );
-
-               wfRunHooks( 'ArticlePageDataAfter', array( &$this, &$row ) );
-
-               return $row;
-       }
-
-       /**
-        * 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
-        */
-       protected function pageDataFromTitle( $dbr, $title ) {
-               return $this->pageData( $dbr, array(
-                       'page_namespace' => $title->getNamespace(),
-                       'page_title'     => $title->getDBkey() ) );
-       }
-
-       /**
-        * Fetch a page record matching the requested ID
-        *
-        * @param $dbr Database
-        * @param $id Integer
-        * @return mixed Database result resource, or false on failure
-        */
-       protected function pageDataFromId( $dbr, $id ) {
-               return $this->pageData( $dbr, array( 'page_id' => $id ) );
-       }
-
-       /**
-        * Set the general counter, title etc data loaded from
-        * some source.
-        *
-        * @param $data Database row object or "fromdb"
-        */
-       public function loadPageData( $data = 'fromdb' ) {
-               if ( $data === 'fromdb' ) {
-                       $dbr = wfGetDB( DB_SLAVE );
-                       $data = $this->pageDataFromTitle( $dbr, $this->mTitle );
-               }
-
-               $lc = LinkCache::singleton();
-
-               if ( $data ) {
-                       $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect, $data->page_latest );
-
-                       $this->mTitle->mArticleID = intval( $data->page_id );
-
-                       # Old-fashioned restrictions
-                       $this->mTitle->loadRestrictions( $data->page_restrictions );
-
-                       $this->mCounter     = intval( $data->page_counter );
-                       $this->mTouched     = wfTimestamp( TS_MW, $data->page_touched );
-                       $this->mIsRedirect  = intval( $data->page_is_redirect );
-                       $this->mLatest      = intval( $data->page_latest );
-               } else {
-                       $lc->addBadLinkObj( $this->mTitle );
-                       $this->mTitle->mArticleID = 0;
-               }
-
-               $this->mDataLoaded = true;
-       }
-
        /**
         * Get text of an article from database
         * Does *NOT* follow redirects.
@@ -513,53 +262,42 @@ class Article {
 
                # Pre-fill content with error message so that if something
                # fails we'll have something telling us what we intended.
-               $t = $this->mTitle->getPrefixedText();
+               $t = $this->getTitle()->getPrefixedText();
                $d = $oldid ? wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid ) : '';
                $this->mContent = wfMsgNoTrans( 'missing-article', $t, $d ) ;
 
                if ( $oldid ) {
                        $revision = Revision::newFromId( $oldid );
-                       if ( $revision === null ) {
+                       if ( !$revision ) {
                                wfDebug( __METHOD__ . " failed to retrieve specified revision, id $oldid\n" );
                                return false;
                        }
-
-                       if ( !$this->mDataLoaded || $this->getID() != $revision->getPage() ) {
-                               $data = $this->pageDataFromId( wfGetDB( DB_SLAVE ), $revision->getPage() );
-
-                               if ( !$data ) {
+                       // Revision title doesn't match the page title given?
+                       if ( $this->mPage->getID() != $revision->getPage() ) {
+                               $function = array( get_class( $this->mPage ), 'newFromID' );
+                               $this->mPage = call_user_func( $function, $revision->getPage() );
+                               if ( !$this->mPage->getId() ) {
                                        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 ) {
-                               $this->loadPageData();
-                       }
-
-                       if ( $this->mLatest === false ) {
-                               wfDebug( __METHOD__ . " failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" );
+                       if ( !$this->mPage->getLatest() ) {
+                               wfDebug( __METHOD__ . " failed to find page data for title " . $this->getTitle()->getPrefixedText() . "\n" );
                                return false;
                        }
 
-                       $revision = Revision::newFromId( $this->mLatest );
-                       if ( $revision === null ) {
-                               wfDebug( __METHOD__ . " failed to retrieve current page, rev_id {$this->mLatest}\n" );
+                       $revision = $this->mPage->getRevision();
+                       if ( !$revision ) {
+                               wfDebug( __METHOD__ . " failed to retrieve current page, rev_id " . $this->mPage->getLatest() . "\n" );
                                return false;
                        }
                }
 
-               // FIXME: Horrible, horrible! This content-loading interface just plain sucks.
+               // @todo 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->getText( Revision::FOR_THIS_USER ); // Loads if user is allowed
 
-               if ( $revision->getId() == $this->mLatest ) {
-                       $this->setLastEdit( $revision );
-               }
-
                $this->mRevIdFetched = $revision->getId();
                $this->mContentLoaded = true;
                $this->mRevision =& $revision;
@@ -570,96 +308,11 @@ class Article {
        }
 
        /**
-        * Read/write accessor to select FOR UPDATE
-        * @FIXME: remove, does nothing
-        *
-        * @param $x Mixed: FIXME
-        * @return mixed value of $x, or value stored in Article::mForUpdate
-        */
-       public function forUpdate( $x = null ) {
-               wfDeprecated();
-               return wfSetVar( $this->mForUpdate, $x );
-       }
-
-       /**
-        * @return int Page ID
-        */
-       public function getID() {
-               return $this->mTitle->getArticleID();
-       }
-
-       /**
-        * @return bool Whether or not the page exists in the database
+        * No-op
+        * @deprecated since 1.18
         */
-       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
-        */
-       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 ),
-                                       __METHOD__
-                               );
-                       }
-               }
-
-               return $this->mCounter;
-       }
-
-       /**
-        * 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
-        */
-       public function isCountable( $text ) {
-               global $wgUseCommaCount;
-
-               $token = $wgUseCommaCount ? ',' : '[[';
-
-               return $this->mTitle->isContentPage() && !$this->isRedirect( $text ) && in_string( $token, $text );
-       }
-
-       /**
-        * Tests if the article text represents a redirect
-        *
-        * @param $text mixed string containing article contents, or boolean
-        * @return bool
-        */
-       public function isRedirect( $text = false ) {
-               if ( $text === false ) {
-                       if ( !$this->mDataLoaded ) {
-                               $this->loadPageData();
-                       }
-
-                       return (bool)$this->mIsRedirect;
-               } else {
-                       return Title::newFromRedirect( $text ) !== null;
-               }
+       public function forUpdate() {
+               wfDeprecated( __METHOD__ );
        }
 
        /**
@@ -673,109 +326,7 @@ class Article {
                        return true;
                }
 
-               return $this->exists() && $this->mRevision && $this->mRevision->isCurrent();
-       }
-
-       /**
-        * Loads everything except the text
-        * This isn't necessary for all uses, so it's only done if needed.
-        */
-       protected function loadLastEdit() {
-               if ( $this->mLastRevision !== null ) {
-                       return; // already loaded
-               }
-
-               # New or non-existent articles have no user information
-               $id = $this->getID();
-               if ( 0 == $id ) {
-                       return;
-               }
-
-               $revision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id );
-               if ( $revision ) {
-                       $this->setLastEdit( $revision );
-               }
-       }
-
-       /**
-        * Set the latest revision
-        */
-       protected function setLastEdit( Revision $revision ) {
-               $this->mLastRevision = $revision;
-               $this->mTimestamp = $revision->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 );
-       }
-
-       /**
-        * @param $audience Integer: one of:
-        *      Revision::FOR_PUBLIC       to be displayed to all users
-        *      Revision::FOR_THIS_USER    to be displayed to $wgUser
-        *      Revision::RAW              get the text regardless of permissions
-        * @return int user ID for the user that made the last article revision
-        */
-       public function getUser( $audience = Revision::FOR_PUBLIC ) {
-               $this->loadLastEdit();
-               if ( $this->mLastRevision ) {
-                       return $this->mLastRevision->getUser( $audience );
-               } else {
-                       return -1;
-               }
-       }
-
-       /**
-        * @param $audience Integer: one of:
-        *      Revision::FOR_PUBLIC       to be displayed to all users
-        *      Revision::FOR_THIS_USER    to be displayed to $wgUser
-        *      Revision::RAW              get the text regardless of permissions
-        * @return string username of the user that made the last article revision
-        */
-       public function getUserText( $audience = Revision::FOR_PUBLIC ) {
-               $this->loadLastEdit();
-               if ( $this->mLastRevision ) {
-                       return $this->mLastRevision->getUserText( $audience );
-               } else {
-                       return '';
-               }
-       }
-
-       /**
-        * @param $audience Integer: one of:
-        *      Revision::FOR_PUBLIC       to be displayed to all users
-        *      Revision::FOR_THIS_USER    to be displayed to $wgUser
-        *      Revision::RAW              get the text regardless of permissions
-        * @return string Comment stored for the last article revision
-        */
-       public function getComment( $audience = Revision::FOR_PUBLIC ) {
-               $this->loadLastEdit();
-               if ( $this->mLastRevision ) {
-                       return $this->mLastRevision->getComment( $audience );
-               } else {
-                       return '';
-               }
-       }
-
-       /**
-        * 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();
-               if ( $this->mLastRevision ) {
-                       return $this->mLastRevision->isMinor();
-               } else {
-                       return false;
-               }
+               return $this->mPage->exists() && $this->mRevision && $this->mRevision->isCurrent();
        }
 
        /**
@@ -787,80 +338,34 @@ class Article {
                if ( $this->mRevIdFetched ) {
                        return $this->mRevIdFetched;
                } else {
-                       return $this->getLatest();
+                       return $this->mPage->getLatest();
                }
        }
 
        /**
-        * Get a list of users who have edited this article, not including the user who made
-        * the most recent revision, which you can get from $article->getUser() if you want it
-        * @return UserArray
+        * This is the default action of the index.php entry point: just view the
+        * page of the given title.
         */
-       public function getContributors() {
-               # FIXME: this is expensive; cache this info somewhere.
+       public function view() {
+               global $wgUser, $wgOut, $wgRequest, $wgParser;
+               global $wgUseFileCache, $wgUseETag;
 
-               $dbr = wfGetDB( DB_SLAVE );
-               $userTable = $dbr->tableName( 'user' );
+               wfProfileIn( __METHOD__ );
 
-               $tables = array( 'revision', 'user' );
+               # Get variables from query string
+               $oldid = $this->getOldID();
 
-               $fields = array(
-                       "$userTable.*",
-                       'rev_user_text AS user_name',
-                       'MAX(rev_timestamp) AS timestamp',
-               );
+               # getOldID may want us to redirect somewhere else
+               if ( $this->mRedirectUrl ) {
+                       $wgOut->redirect( $this->mRedirectUrl );
+                       wfDebug( __METHOD__ . ": redirecting due to oldid\n" );
+                       wfProfileOut( __METHOD__ );
 
-               $conds = array( 'rev_page' => $this->getId() );
+                       return;
+               }
 
-               // The user who made the top revision gets credited as "this page was last edited by
-               // John, based on contributions by Tom, Dick and Harry", so don't include them twice.
-               $user = $this->getUser();
-               if ( $user ) {
-                       $conds[] = "rev_user != $user";
-               } else {
-                       $conds[] = "rev_user_text != {$dbr->addQuotes( $this->getUserText() )}";
-               }
-
-               $conds[] = "{$dbr->bitAnd( 'rev_deleted', Revision::DELETED_USER )} = 0"; // username hidden?
-
-               $jconds = array(
-                       'user' => array( 'LEFT JOIN', 'rev_user = user_id' ),
-               );
-
-               $options = array(
-                       'GROUP BY' => array( 'rev_user', 'rev_user_text' ),
-                       'ORDER BY' => 'timestamp DESC',
-               );
-               
-               $res = $dbr->select( $tables, $fields, $conds, __METHOD__, $options, $jconds );
-               return new UserArrayFromResult( $res );
-       }
-
-       /**
-        * 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__ );
-
-               # Get variables from query string
-               $oldid = $this->getOldID();
-
-               # 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;
-               }
-
-               $wgOut->setArticleFlag( true );
                # Set page title (may be overridden by DISPLAYTITLE)
-               $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+               $wgOut->setPageTitle( $this->getTitle()->getPrefixedText() );
 
                # If we got diff in the query, we want to see a diff page instead of the article.
                if ( $wgRequest->getCheck( 'diff' ) ) {
@@ -871,45 +376,46 @@ class Article {
                        return;
                }
 
+               $wgOut->setArticleFlag( true );
                # Allow frames by default
                $wgOut->allowClickjacking();
 
                $parserCache = ParserCache::singleton();
 
-               $parserOptions = $this->getParserOptions();
+               $parserOptions = $this->mPage->getParserOptions();
                # Render printable version, use printable version cache
                if ( $wgOut->isPrintable() ) {
                        $parserOptions->setIsPrintable( true );
                        $parserOptions->setEditSection( false );
-               } else if ( $wgUseETag && !$this->mTitle->quickUserCan( 'edit' ) ) {
+               } elseif ( $wgUseETag && !$this->getTitle()->quickUserCan( 'edit' ) ) {
                        $parserOptions->setEditSection( false );
                }
 
                # Try client and file cache
-               if ( $oldid === 0 && $this->checkTouched() ) {
+               if ( $oldid === 0 && $this->mPage->checkTouched() ) {
                        if ( $wgUseETag ) {
                                $wgOut->setETag( $parserCache->getETag( $this, $parserOptions ) );
                        }
 
                        # Is it client cached?
-                       if ( $wgOut->checkLastModified( $this->getTouched() ) ) {
+                       if ( $wgOut->checkLastModified( $this->mPage->getTouched() ) ) {
                                wfDebug( __METHOD__ . ": done 304\n" );
                                wfProfileOut( __METHOD__ );
 
                                return;
                        # Try file cache
-                       } else if ( $wgUseFileCache && $this->tryFileCache() ) {
+                       } elseif ( $wgUseFileCache && $this->tryFileCache() ) {
                                wfDebug( __METHOD__ . ": done file cache\n" );
                                # tell wgOut that output is taken care of
                                $wgOut->disable();
-                               $this->viewUpdates();
+                               $this->mPage->viewUpdates();
                                wfProfileOut( __METHOD__ );
 
                                return;
                        }
                }
 
-               if ( !$wgUseETag && !$this->mTitle->quickUserCan( 'edit' ) ) {
+               if ( !$wgUseETag && !$this->getTitle()->quickUserCan( 'edit' ) ) {
                        $parserOptions->setEditSection( false );
                }
 
@@ -944,14 +450,18 @@ class Article {
                                                        $wgOut->addParserOutput( $this->mParserOutput );
                                                        # Ensure that UI elements requiring revision ID have
                                                        # the correct version information.
-                                                       $wgOut->setRevisionId( $this->mLatest );
+                                                       $wgOut->setRevisionId( $this->mPage->getLatest() );
                                                        $outputDone = true;
+                                                       # Preload timestamp to avoid a DB hit
+                                                       if ( isset( $this->mParserOutput->mTimestamp ) ) {
+                                                               $this->mPage->setTimestamp( $this->mParserOutput->mTimestamp );
+                                                       }
                                                }
                                        }
                                        break;
                                case 3:
                                        $text = $this->getContent();
-                                       if ( $text === false || $this->getID() == 0 ) {
+                                       if ( $text === false || $this->mPage->getID() == 0 ) {
                                                wfDebug( __METHOD__ . ": showing missing article\n" );
                                                $this->showMissingArticle();
                                                wfProfileOut( __METHOD__ );
@@ -959,7 +469,7 @@ class Article {
                                        }
 
                                        # Another whitelist check in case oldid is altering the title
-                                       if ( !$this->mTitle->userCanRead() ) {
+                                       if ( !$this->getTitle()->userCanRead() ) {
                                                wfDebug( __METHOD__ . ": denied on secondary read check\n" );
                                                $wgOut->loginToUse();
                                                $wgOut->output();
@@ -979,12 +489,12 @@ class Article {
                                                }
 
                                                # If this "old" version is the current, then try the parser cache...
-                                               if ( $oldid === $this->getLatest() && $this->useParserCache( false ) ) {
+                                               if ( $oldid === $this->mPage->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 );
+                                                               $wgOut->setRevisionId( $this->mPage->getLatest() );
                                                                $outputDone = true;
                                                                break;
                                                        }
@@ -996,10 +506,13 @@ class Article {
                                        $wgOut->setRevisionId( $this->getRevIdFetched() );
 
                                        # Pages containing custom CSS or JavaScript get special treatment
-                                       if ( $this->mTitle->isCssOrJsPage() || $this->mTitle->isCssJsSubpage() ) {
+                                       if ( $this->getTitle()->isCssOrJsPage() || $this->getTitle()->isCssJsSubpage() ) {
                                                wfDebug( __METHOD__ . ": showing CSS/JS source\n" );
                                                $this->showCssOrJsPage();
                                                $outputDone = true;
+                                       } elseif( !wfRunHooks( 'ArticleViewCustom', array( $this->mContent, $this->getTitle(), $wgOut ) ) ) {
+                                               # Allow extensions do their own custom view for certain pages
+                                               $outputDone = true;
                                        } else {
                                                $rt = Title::newFromRedirectArray( $text );
                                                if ( $rt ) {
@@ -1008,7 +521,7 @@ class Article {
                                                        # 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 );
+                                                       $this->mParserOutput = $wgParser->parse( $text, $this->getTitle(), $parserOptions );
                                                        $wgOut->addParserOutputNoText( $this->mParserOutput );
                                                        $outputDone = true;
                                                }
@@ -1048,10 +561,10 @@ class Article {
                # 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() ) ) {
+               if ( $this->getTitle()->isMainPage() ) {
                        $msg = wfMessage( 'pagetitle-view-mainpage' )->inContentLanguage();
                        if ( !$msg->isDisabled() ) {
-                               $wgOut->setHTMLTitle( $msg->title( $this->mTitle )->text() );
+                               $wgOut->setHTMLTitle( $msg->title( $this->getTitle() )->text() );
                        }
                }
 
@@ -1062,7 +575,7 @@ class Article {
                $wgOut->setFollowPolicy( $policy['follow'] );
 
                $this->showViewFooter();
-               $this->viewUpdates();
+               $this->mPage->viewUpdates();
                wfProfileOut( __METHOD__ );
        }
 
@@ -1080,14 +593,14 @@ class Article {
                $unhide = $wgRequest->getInt( 'unhide' ) == 1;
                $oldid = $this->getOldID();
 
-               $de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid, $purge, $unhide );
+               $de = new DifferenceEngine( $this->getTitle(), $oldid, $diff, $rcid, $purge, $unhide );
                // DifferenceEngine directly fetched the revision:
                $this->mRevIdFetched = $de->mNewid;
                $de->showDiffPage( $diffOnly );
 
-               if ( $diff == 0 || $diff == $this->getLatest() ) {
+               if ( $diff == 0 || $diff == $this->mPage->getLatest() ) {
                        # Run view updates for current revision only
-                       $this->viewUpdates();
+                       $this->mPage->viewUpdates();
                }
        }
 
@@ -1101,13 +614,17 @@ class Article {
        protected function showCssOrJsPage() {
                global $wgOut;
 
-               $wgOut->wrapWikiMsg( "<div id='mw-clearyourcache'>\n$1\n</div>", 'clearyourcache' );
+               $dir = $this->getContext()->getLang()->getDir();
+               $lang = $this->getContext()->getLang()->getCode();
+
+               $wgOut->wrapWikiMsg( "<div id='mw-clearyourcache' lang='$lang' dir='$dir' class='mw-content-$dir'>\n$1\n</div>",
+                       'clearyourcache' );
 
                // Give hooks a chance to customise the output
-               if ( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->mTitle, $wgOut ) ) ) {
+               if ( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->getTitle(), $wgOut ) ) ) {
                        // Wrap the whole lot in a <pre> and don't parse
                        $m = array();
-                       preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );
+                       preg_match( '!\.(css|js)$!u', $this->getTitle()->getText(), $m );
                        $wgOut->addHTML( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
                        $wgOut->addHTML( htmlspecialchars( $this->mContent ) );
                        $wgOut->addHTML( "\n</pre>\n" );
@@ -1124,12 +641,12 @@ class Article {
                global $wgOut, $wgArticleRobotPolicies, $wgNamespaceRobotPolicies;
                global $wgDefaultRobotPolicy, $wgRequest;
 
-               $ns = $this->mTitle->getNamespace();
+               $ns = $this->getTitle()->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() ) {
-                               if ( Block::newFromTarget( null, $this->mTitle->getText() ) instanceof Block ) {
+                       if ( !$this->getTitle()->isSubpage() ) {
+                               if ( Block::newFromTarget( null, $this->getTitle()->getText() ) instanceof Block ) {
                                        return array(
                                                'index'  => 'noindex',
                                                'follow' => 'nofollow'
@@ -1138,7 +655,7 @@ class Article {
                        }
                }
 
-               if ( $this->getID() === 0 || $this->getOldID() ) {
+               if ( $this->mPage->getID() === 0 || $this->getOldID() ) {
                        # Non-articles (special pages etc), and old revisions
                        return array(
                                'index'  => 'noindex',
@@ -1168,7 +685,7 @@ class Article {
                                self::formatRobotPolicy( $wgNamespaceRobotPolicies[$ns] )
                        );
                }
-               if ( $this->mTitle->canUseNoindex() && is_object( $this->mParserOutput ) && $this->mParserOutput->getIndexPolicy() ) {
+               if ( $this->getTitle()->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(
@@ -1177,11 +694,11 @@ class Article {
                        );
                }
 
-               if ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) {
+               if ( isset( $wgArticleRobotPolicies[$this->getTitle()->getPrefixedText()] ) ) {
                        # (bug 14900) site config can override user-defined __INDEX__ or __NOINDEX__
                        $policy = array_merge(
                                $policy,
-                               self::formatRobotPolicy( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] )
+                               self::formatRobotPolicy( $wgArticleRobotPolicies[$this->getTitle()->getPrefixedText()] )
                        );
                }
 
@@ -1225,7 +742,7 @@ class Article {
         * @return boolean
         */
        public function showRedirectedFromHeader() {
-               global $wgOut, $wgUser, $wgRequest, $wgRedirectSources;
+               global $wgOut, $wgRequest, $wgRedirectSources;
 
                $rdfrom = $wgRequest->getVal( 'rdfrom' );
 
@@ -1233,7 +750,7 @@ class Article {
                        // This is an internally redirected page view.
                        // We'll need a backlink to the source page for navigation.
                        if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
-                               $redir = $wgUser->getSkin()->link(
+                               $redir = Linker::link(
                                        $this->mRedirectedFrom,
                                        null,
                                        array(),
@@ -1245,14 +762,14 @@ class Article {
                                $wgOut->setSubtitle( $s );
 
                                // Set the fragment if one was specified in the redirect
-                               if ( strval( $this->mTitle->getFragment() ) != '' ) {
-                                       $fragment = Xml::escapeJsString( $this->mTitle->getFragmentForURL() );
+                               if ( strval( $this->getTitle()->getFragment() ) != '' ) {
+                                       $fragment = Xml::escapeJsString( $this->getTitle()->getFragmentForURL() );
                                        $wgOut->addInlineScript( "redirectToFragment(\"$fragment\");" );
                                }
 
                                // Add a <link rel="canonical"> tag
                                $wgOut->addLink( array( 'rel' => 'canonical',
-                                       'href' => $this->mTitle->getLocalURL() )
+                                       'href' => $this->getTitle()->getLocalURL() )
                                );
 
                                return true;
@@ -1261,7 +778,7 @@ class Article {
                        // 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 = $wgUser->getSkin()->makeExternalLink( $rdfrom, $rdfrom );
+                               $redir = Linker::makeExternalLink( $rdfrom, $rdfrom );
                                $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
                                $wgOut->setSubtitle( $s );
 
@@ -1279,7 +796,7 @@ class Article {
        public function showNamespaceHeader() {
                global $wgOut;
 
-               if ( $this->mTitle->isTalkPage() ) {
+               if ( $this->getTitle()->isTalkPage() ) {
                        if ( !wfMessage( 'talkpageheader' )->isDisabled() ) {
                                $wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1\n</div>", array( 'talkpageheader' ) );
                        }
@@ -1293,7 +810,7 @@ class Article {
                global $wgOut, $wgUseTrackbacks;
 
                # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
-               if ( $this->mTitle->getNamespace() == NS_USER_TALK && IP::isValid( $this->mTitle->getText() ) ) {
+               if ( $this->getTitle()->getNamespace() == NS_USER_TALK && IP::isValid( $this->getTitle()->getText() ) ) {
                        $wgOut->addWikiMsg( 'anontalkpagetext' );
                }
 
@@ -1320,11 +837,10 @@ class Article {
 
                $rcid = $wgRequest->getVal( 'rcid' );
 
-               if ( !$rcid || !$this->mTitle->quickUserCan( 'patrol' ) ) {
+               if ( !$rcid || !$this->getTitle()->quickUserCan( 'patrol' ) ) {
                        return;
                }
 
-               $sk = $wgUser->getSkin();
                $token = $wgUser->editToken( $rcid );
                $wgOut->preventClickjacking();
 
@@ -1332,8 +848,8 @@ class Article {
                        "<div class='patrollink'>" .
                                wfMsgHtml(
                                        'markaspatrolledlink',
-                                       $sk->link(
-                                               $this->mTitle,
+                                       Linker::link(
+                                               $this->getTitle(),
                                                wfMsgHtml( 'markaspatrolledtext' ),
                                                array(),
                                                array(
@@ -1356,16 +872,16 @@ class Article {
                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() );
+               if ( $this->getTitle()->getNamespace() == NS_USER || $this->getTitle()->getNamespace() == NS_USER_TALK ) {
+                       $parts = explode( '/', $this->getTitle()->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
+                                       array( 'userpage-userdoesnotexist-view', wfEscapeWikiText( $rootPart ) ) );
+                       } elseif ( $user->isBlocked() ) { # Show log extract if the user is currently blocked
                                LogEventsList::showLogExtract(
                                        $wgOut,
                                        'block',
@@ -1386,7 +902,7 @@ class Article {
                wfRunHooks( 'ShowMissingArticle', array( $this ) );
 
                # Show delete and move logs
-               LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move' ), $this->mTitle->getPrefixedText(), '',
+               LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move' ), $this->getTitle()->getPrefixedText(), '',
                        array(  'lim' => 10,
                                'conds' => array( "log_action != 'revision'" ),
                                'showIfEmpty' => false,
@@ -1397,14 +913,14 @@ class Article {
                $oldid = $this->getOldID();
                if ( $oldid ) {
                        $text = wfMsgNoTrans( 'missing-article',
-                               $this->mTitle->getPrefixedText(),
+                               $this->getTitle()->getPrefixedText(),
                                wfMsgNoTrans( 'missingarticle-rev', $oldid ) );
-               } elseif ( $this->mTitle->getNamespace() === NS_MEDIAWIKI ) {
+               } elseif ( $this->getTitle()->getNamespace() === NS_MEDIAWIKI ) {
                        // Use the default message text
-                       $text = $this->mTitle->getDefaultMessageText();
+                       $text = $this->getTitle()->getDefaultMessageText();
                } else {
-                       $createErrors = $this->mTitle->getUserPermissionsErrors( 'create', $wgUser );
-                       $editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser );
+                       $createErrors = $this->getTitle()->getUserPermissionsErrors( 'create', $wgUser );
+                       $editErrors = $this->getTitle()->getUserPermissionsErrors( 'edit', $wgUser );
                        $errors = array_merge( $createErrors, $editErrors );
 
                        if ( !count( $errors ) ) {
@@ -1415,7 +931,7 @@ class Article {
                }
                $text = "<div class='noarticletext'>\n$text\n</div>";
 
-               if ( !$this->hasViewableContent() ) {
+               if ( !$this->mPage->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" );
@@ -1445,10 +961,10 @@ class Article {
 
                        return false;
                // If the user needs to confirm that they want to see it...
-               } else if ( $wgRequest->getInt( 'unhide' ) != 1 ) {
+               } elseif ( $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" );
+                       $link = $this->getTitle()->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",
@@ -1465,22 +981,6 @@ class Article {
                }
        }
 
-       /**
-        * 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
         */
@@ -1488,13 +988,13 @@ class Article {
                global $wgOut;
 
                $oldid = $this->getOldID();
-               $parserOptions = $this->getParserOptions();
+               $parserOptions = $this->mPage->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' ) ) {
+               if ( !$this->isCurrent() || $wgOut->isPrintable() || !$this->getTitle()->quickUserCan( 'edit' ) ) {
                        $parserOptions->setEditSection( false );
                }
 
@@ -1515,7 +1015,7 @@ class Article {
        public function tryDirtyCache() {
                global $wgOut;
                $parserCache = ParserCache::singleton();
-               $options = $this->getParserOptions();
+               $options = $this->mPage->getParserOptions();
 
                if ( $wgOut->isPrintable() ) {
                        $options->setIsPrintable( true );
@@ -1550,37 +1050,37 @@ class Article {
         * @return string containing HMTL with redirect link
         */
        public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
-               global $wgOut, $wgContLang, $wgStylePath, $wgUser;
+               global $wgOut, $wgStylePath;
 
                if ( !is_array( $target ) ) {
                        $target = array( $target );
                }
 
-               $imageDir = $wgContLang->getDir();
+               $lang = $this->getTitle()->getPageLanguage();
+               $imageDir = $lang->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() ) );
+                       $link = Linker::linkKnown( $title, htmlspecialchars( $title->getFullText() ) );
                } else {
-                       $link = $sk->link( $title, htmlspecialchars( $title->getFullText() ) );
+                       $link = Linker::link( $title, htmlspecialchars( $title->getFullText() ) );
                }
 
                $nextRedirect = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png';
-               $alt = $wgContLang->isRTL() ? '←' : '→';
+               $alt = $lang->isRTL() ? '←' : '→';
                // Automatically append redirect=no to each link, since most of them are redirect pages themselves.
                foreach ( $target as $rt ) {
                        $link .= Html::element( 'img', array( 'src' => $nextRedirect, 'alt' => $alt ) );
                        if ( $forceKnown ) {
-                               $link .= $sk->linkKnown( $rt, htmlspecialchars( $rt->getFullText(), array(), array( 'redirect' => 'no' ) ) );
+                               $link .= Linker::linkKnown( $rt, htmlspecialchars( $rt->getFullText(), array(), array( 'redirect' => 'no' ) ) );
                        } else {
-                               $link .= $sk->link( $rt, htmlspecialchars( $rt->getFullText() ), array(), array( 'redirect' => 'no' ) );
+                               $link .= Linker::link( $rt, htmlspecialchars( $rt->getFullText() ), array(), array( 'redirect' => 'no' ) );
                        }
                }
 
@@ -1599,7 +1099,7 @@ class Article {
                $dbr = wfGetDB( DB_SLAVE );
                $tbs = $dbr->select( 'trackbacks',
                        array( 'tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name' ),
-                       array( 'tb_page' => $this->getID() )
+                       array( 'tb_page' => $this->mPage->getID() )
                );
 
                if ( !$dbr->numRows( $tbs ) ) {
@@ -1612,9 +1112,9 @@ class Article {
                foreach ( $tbs as $o ) {
                        $rmvtxt = "";
 
-                       if ( $wgOut->getUser()->isAllowed( 'trackback' ) ) {
-                               $delurl = $this->mTitle->getFullURL( "action=deletetrackback&tbid=" .
-                                       $o->tb_id . "&token=" . urlencode( $wgOut->getUser()->editToken() ) );
+                       if ( $this->getContext()->getUser()->isAllowed( 'trackback' ) ) {
+                               $delurl = $this->getTitle()->getFullURL( "action=deletetrackback&tbid=" .
+                                       $o->tb_id . "&token=" . urlencode( $this->getContext()->getUser()->editToken() ) );
                                $rmvtxt = wfMsg( 'trackbackremove', htmlspecialchars( $delurl ) );
                        }
 
@@ -1632,29 +1132,10 @@ class Article {
 
        /**
         * Removes trackback record for current article from trackbacks table
+        * @deprecated since 1.18
         */
        public function deletetrackback() {
-               global $wgRequest, $wgOut;
-
-               if ( !$wgOut->getUser()->matchEditToken( $wgRequest->getVal( 'token' ) ) ) {
-                       $wgOut->addWikiMsg( 'sessionfailure' );
-
-                       return;
-               }
-
-               $permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgOut->getUser() );
-
-               if ( count( $permission_errors ) ) {
-                       $wgOut->showPermissionsErrorPage( $permission_errors );
-
-                       return;
-               }
-
-               $db = wfGetDB( DB_MASTER );
-               $db->delete( 'trackbacks', array( 'tb_id' => $wgRequest->getInt( 'tbid' ) ) );
-
-               $wgOut->addWikiMsg( 'trackbackdeleteok' );
-               $this->mTitle->invalidateCache();
+               return Action::factory( 'deletetrackback', $this )->show();
        }
 
        /**
@@ -1672,604 +1153,107 @@ class Article {
         * Handle action=purge
         */
        public function purge() {
-               global $wgRequest, $wgOut;
-
-               if ( $wgOut->getUser()->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) {
-                       //FIXME: shouldn't this be in doPurge()?
-                       if ( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
-                               $this->doPurge();
-                               $this->view();
-                       }
-               } else {
-                       $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' );
-               }
+               return Action::factory( 'purge', $this )->show();
        }
 
        /**
-        * Perform the actions of a page purging
+        * Mark this particular edit/page as patrolled
+        * @deprecated since 1.18
         */
-       public function doPurge() {
-               global $wgUseSquid;
-
-               // Invalidate the cache
-               $this->mTitle->invalidateCache();
-               $this->clear();
-
-               if ( $wgUseSquid ) {
-                       // Commit the transaction before the purge is sent
-                       $dbw = wfGetDB( DB_MASTER );
-                       $dbw->commit();
-
-                       // Send purge
-                       $update = SquidUpdate::newSimplePurge( $this->mTitle );
-                       $update->doUpdate();
-               }
-
-               if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                       if ( $this->getID() == 0 ) {
-                               $text = false;
-                       } else {
-                               $text = $this->getRawText();
-                       }
-
-                       MessageCache::singleton()->replace( $this->mTitle->getDBkey(), $text );
-               }
+       public function markpatrolled() {
+               Action::factory( 'markpatrolled', $this )->show();
        }
 
        /**
-        * Insert a new empty page record for this article.
-        * This *must* be followed up by creating a revision
-        * and running $this->updateRevisionOn( ... );
-        * or else the record will be left in a funky state.
-        * Best if all done inside a transaction.
-        *
-        * @param $dbw Database
-        * @return int The newly created page_id key, or false if the title already existed
-        * @private
+        * User-interface handler for the "watch" action.
+        * Requires Request to pass a token as of 1.18.
+        * @deprecated since 1.18
         */
-       public function insertOn( $dbw ) {
-               wfProfileIn( __METHOD__ );
-
-               $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
-               $dbw->insert( 'page', array(
-                       'page_id'           => $page_id,
-                       'page_namespace'    => $this->mTitle->getNamespace(),
-                       'page_title'        => $this->mTitle->getDBkey(),
-                       'page_counter'      => 0,
-                       'page_restrictions' => '',
-                       'page_is_redirect'  => 0, # Will set this shortly...
-                       'page_is_new'       => 1,
-                       'page_random'       => wfRandom(),
-                       'page_touched'      => $dbw->timestamp(),
-                       'page_latest'       => 0, # Fill this in shortly...
-                       'page_len'          => 0, # Fill this in shortly...
-               ), __METHOD__, 'IGNORE' );
-
-               $affected = $dbw->affectedRows();
-
-               if ( $affected ) {
-                       $newid = $dbw->insertId();
-                       $this->mTitle->resetArticleID( $newid );
-               }
-               wfProfileOut( __METHOD__ );
-
-               return $affected ? $newid : false;
+       public function watch() {
+               Action::factory( 'watch', $this )->show();
        }
 
        /**
-        * Update the page record to point to a newly saved revision.
+        * Add this page to $wgUser's watchlist
         *
-        * @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.
-        * @param $setNewFlag Boolean: Set to true if a page flag should be set
-        *                    Needed when $lastRevision has to be set to sth. !=0
-        * @return bool true on success, false on failure
-        * @private
+        * This is safe to be called multiple times
+        *
+        * @return bool true on successful watch operation
+        * @deprecated since 1.18
         */
-       public function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null, $setNewFlag = false ) {
-               wfProfileIn( __METHOD__ );
-
-               $text = $revision->getText();
-               $rt = Title::newFromRedirectRecurse( $text );
-
-               $conditions = array( 'page_id' => $this->getId() );
-
-               if ( !is_null( $lastRevision ) ) {
-                       # An extra check against threads stepping on each other
-                       $conditions['page_latest'] = $lastRevision;
-               }
-
-               if ( !$setNewFlag ) {
-                       $setNewFlag = ( $lastRevision === 0 );
-               }
-
-               $dbw->update( 'page',
-                       array( /* SET */
-                               'page_latest'      => $revision->getId(),
-                               'page_touched'     => $dbw->timestamp(),
-                               'page_is_new'      => $setNewFlag,
-                               'page_is_redirect' => $rt !== null ? 1 : 0,
-                               'page_len'         => strlen( $text ),
-                       ),
-                       $conditions,
-                       __METHOD__ );
-
-               $result = $dbw->affectedRows() != 0;
-               if ( $result ) {
-                       $this->updateRedirectOn( $dbw, $rt, $lastRevIsRedirect );
-               }
-
-               wfProfileOut( __METHOD__ );
-               return $result;
+       public function doWatch() {
+               global $wgUser;
+               return WatchAction::doWatch( $this->getTitle(), $wgUser );
        }
 
        /**
-        * Add row to the redirect table if this is a redirect, remove otherwise.
-        *
-        * @param $dbw Database
-        * @param $redirectTitle Title object pointing to the redirect target,
-        *                       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
+        * User interface handler for the "unwatch" action.
+        * Requires Request to pass a token as of 1.18.
+        * @deprecated since 1.18
         */
-       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 ) {
-                       return true;
-               }
-
-               wfProfileIn( __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__ );
-               }
-
-               if ( $this->getTitle()->getNamespace() == NS_FILE ) {
-                       RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() );
-               }
-               wfProfileOut( __METHOD__ );
-
-               return ( $dbw->affectedRows() != 0 );
+       public function unwatch() {
+               Action::factory( 'unwatch', $this )->show();
        }
 
        /**
-        * If the given revision is newer than the currently set page_latest,
-        * update the page record. Otherwise, do nothing.
-        *
-        * @param $dbw Database object
-        * @param $revision Revision object
-        * @return mixed
+        * Stop watching a page
+        * @return bool true on successful unwatch
+        * @deprecated since 1.18
         */
-       public function updateIfNewerOn( &$dbw, $revision ) {
-               wfProfileIn( __METHOD__ );
-
-               $row = $dbw->selectRow(
-                       array( 'revision', 'page' ),
-                       array( 'rev_id', 'rev_timestamp', 'page_is_redirect' ),
-                       array(
-                               'page_id' => $this->getId(),
-                               'page_latest=rev_id' ),
-                       __METHOD__ );
-
-               if ( $row ) {
-                       if ( wfTimestamp( TS_MW, $row->rev_timestamp ) >= $revision->getTimestamp() ) {
-                               wfProfileOut( __METHOD__ );
-                               return false;
-                       }
-                       $prev = $row->rev_id;
-                       $lastRevIsRedirect = (bool)$row->page_is_redirect;
-               } else {
-                       # No or missing previous revision; mark the page as new
-                       $prev = 0;
-                       $lastRevIsRedirect = null;
-               }
-
-               $ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect );
-
-               wfProfileOut( __METHOD__ );
-               return $ret;
+       public function doUnwatch() {
+               global $wgUser;
+               return WatchAction::doUnwatch( $this->getTitle(), $wgUser );
        }
 
        /**
-        * @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
+        * action=protect handler
         */
-       public function replaceSection( $section, $text, $summary = '', $edittime = null ) {
-               wfProfileIn( __METHOD__ );
-
-               if ( strval( $section ) == '' ) {
-                       // Whole-page edit; let the whole text through
-               } else {
-                       if ( is_null( $edittime ) ) {
-                               $rev = Revision::newFromTitle( $this->mTitle );
-                       } else {
-                               $dbw = wfGetDB( DB_MASTER );
-                               $rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
-                       }
-
-                       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' ) {
-                               # Inserting a new section
-                               $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__ );
-               return $text;
+       public function protect() {
+               $form = new ProtectionForm( $this );
+               $form->execute();
        }
 
        /**
-        * Check flags and add EDIT_NEW or EDIT_UPDATE to them as needed.
-        * @param $flags Int
-        * @return Int updated $flags
+        * action=unprotect handler (alias)
         */
-       function checkFlags( $flags ) {
-               if ( !( $flags & EDIT_NEW ) && !( $flags & EDIT_UPDATE ) ) {
-                       if ( $this->mTitle->getArticleID() ) {
-                               $flags |= EDIT_UPDATE;
-                       } else {
-                               $flags |= EDIT_NEW;
-                       }
-               }
-
-               return $flags;
+       public function unprotect() {
+               $this->protect();
        }
 
        /**
-        * Article::doEdit()
-        *
-        * Change an existing article or create a new article. Updates RC and all necessary caches,
-        * optionally via the deferred update array.
-        *
-        * $wgUser must be set before calling this function.
-        *
-        * @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
-        *          Article is known or assumed to be pre-existing, update it
-        *      EDIT_MINOR
-        *          Mark this edit minor, if the user is allowed to do so
-        *      EDIT_SUPPRESS_RC
-        *          Do not log the change in recentchanges
-        *      EDIT_FORCE_BOT
-        *          Mark the edit a "bot" edit regardless of user rights
-        *      EDIT_DEFER_UPDATES
-        *          Defer some of the updates until the end of index.php
-        *      EDIT_AUTOSUMMARY
-        *          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 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 User (optional), $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
-        *
-        *  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
+        * Info about this page
+        * Called for ?action=info when $wgAllowPageInfo is on.
         */
-       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__ );
-
-               $user = is_null( $user ) ? $wgUser : $user;
-               $status = Status::newGood( array() );
-
-               # Load $this->mTitle->getArticleID() and $this->mLatest if it's not already
-               $this->loadPageData();
-
-               $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 $status;
-               }
-
-               # Silently ignore EDIT_MINOR if not allowed
-               $isminor = ( $flags & EDIT_MINOR ) && $user->isAllowed( 'minoredit' );
-               $bot = $flags & EDIT_FORCE_BOT;
-
-               $oldtext = $this->getRawText(); // current revision
-               $oldsize = strlen( $oldtext );
-
-               # Provide autosummaries if one is not provided and autosummaries are enabled.
-               if ( $wgUseAutomaticEditSummaries && $flags & EDIT_AUTOSUMMARY && $summary == '' ) {
-                       $summary = $this->getAutosummary( $oldtext, $text, $flags );
-               }
-
-               $editInfo = $this->prepareTextForEdit( $text, null, $user );
-               $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 ) {
-                               $userAbort = ignore_user_abort( true );
-                       }
-
-                       $changed = ( strcmp( $text, $oldtext ) != 0 );
-
-                       if ( $changed ) {
-                               $this->mGoodAdjustment = (int)$this->isCountable( $text )
-                                 - (int)$this->isCountable( $oldtext );
-                               $this->mTotalAdjustment = 0;
-
-                               if ( !$this->mLatest ) {
-                                       # Article gone missing
-                                       wfDebug( __METHOD__ . ": EDIT_UPDATE specified but article doesn't exist\n" );
-                                       $status->fatal( 'edit-gone-missing' );
-
-                                       wfProfileOut( __METHOD__ );
-                                       return $status;
-                               }
-
-                               $revision = new Revision( array(
-                                       'page'       => $this->getId(),
-                                       'comment'    => $summary,
-                                       'minor_edit' => $isminor,
-                                       'text'       => $text,
-                                       'parent_id'  => $this->mLatest,
-                                       'user'       => $user->getId(),
-                                       'user_text'  => $user->getName(),
-                                       'timestamp'  => $now
-                               ) );
-
-                               $dbw->begin();
-                               $revisionId = $revision->insertOn( $dbw );
-
-                               # Update page
-                               #
-                               # 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!! */
-                                       $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 ) ) {
-                                               # Mark as patrolled if the user can do so
-                                               $patrolled = $wgUseRCPatrol && !count(
-                                                       $this->mTitle->getUserPermissionsErrors( 'autopatrol', $user ) );
-                                               # 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 );
-                                               }
-                                       }
-                                       $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->getLatest();
-                               // Update page_touched, this is usually implicit in the page update
-                               // Other cache updates are done in onArticleEdit()
-                               $this->mTitle->invalidateCache();
-                       }
-
-                       if ( !$wgDBtransactions ) {
-                               ignore_user_abort( $userAbort );
-                       }
-
-                       // 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, $user );
-               } else {
-                       # Create new article
-                       $status->value['new'] = true;
-
-                       # Set statistics members
-                       # We work out if it's countable after PST to avoid counter drift
-                       # when articles are created with {{subst:}}
-                       $this->mGoodAdjustment = (int)$this->isCountable( $text );
-                       $this->mTotalAdjustment = 1;
-
-                       $dbw->begin();
-
-                       # Add the page record; stake our claim on this title!
-                       # 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,
-                               'user'       => $user->getId(),
-                               'user_text'  => $user->getName(),
-                               'timestamp'  => $now
-                       ) );
-                       $revisionId = $revision->insertOn( $dbw );
-
-                       $this->mTitle->resetArticleID( $newid );
-                       # Update the LinkCache. Resetting the Title ArticleID means it will rely on having that already cached (FIXME?)
-                       LinkCache::singleton()->addGoodLinkObj( $newid, $this->mTitle, strlen( $text ), (bool)Title::newFromRedirect( $text ), $revisionId );
-
-                       # Update the page record with revision data
-                       $this->updateRevisionOn( $dbw, $revision, 0 );
-
-                       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 ) && !count(
-                                       $this->mTitle->getUserPermissionsErrors( 'autopatrol', $user ) );
-                               # 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 );
-                               }
-                       }
-                       $user->incEditCount();
-                       $dbw->commit();
-
-                       # Update links, etc.
-                       $this->editUpdates( $text, $summary, $isminor, $now, $revisionId, true, $user );
-
-                       # Clear caches
-                       Article::onArticleCreate( $this->mTitle );
-
-                       wfRunHooks( 'ArticleInsertComplete', array( &$this, &$user, $text, $summary,
-                               $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
-               }
-
-               # Do updates right now unless deferral was requested
-               if ( !( $flags & EDIT_DEFER_UPDATES ) ) {
-                       wfDoUpdates();
-               }
-
-               // Return the new revision (or null) to the caller
-               $status->value['revision'] = $revision;
+       public function info() {
+               Action::factory( 'info', $this )->show();
+       }
 
-               wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $text, $summary,
-                       $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ) );
+       /**
+        * Overriden by ImagePage class, only present here to avoid a fatal error
+        * Called for ?action=revert
+        */
+       public function revert() {
+               Action::factory( 'revert', $this )->show();
+       }
 
-               wfProfileOut( __METHOD__ );
-               return $status;
+       /**
+        * User interface for rollback operations
+        */
+       public function rollback() {
+               Action::factory( 'rollback', $this )->show();
        }
 
        /**
         * Output a redirect back to the article.
         * This is typically used after an edit.
         *
+        * @deprecated in 1.18; call $wgOut->redirect() directly
         * @param $noRedir Boolean: add redirect=no
         * @param $sectionAnchor String: section to redirect to, including "#"
         * @param $extraQuery String: extra query params
         */
        public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
+               wfDeprecated( __METHOD__ );
                global $wgOut;
 
                if ( $noRedir ) {
@@ -2280,491 +1264,22 @@ class Article {
                        $query = $extraQuery;
                }
 
-               $wgOut->redirect( $this->mTitle->getFullURL( $query ) . $sectionAnchor );
+               $wgOut->redirect( $this->getTitle()->getFullURL( $query ) . $sectionAnchor );
        }
 
        /**
-        * Mark this particular edit/page as patrolled
+        * UI entry point for page deletion
         */
-       public function markpatrolled() {
+       public function delete() {
                global $wgOut, $wgRequest;
 
-               $wgOut->setRobotPolicy( 'noindex,nofollow' );
+               $confirm = $wgRequest->wasPosted() &&
+                               $this->getContext()->getUser()->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
 
-               # If we haven't been given an rc_id value, we can't do anything
-               $rcid = (int) $wgRequest->getVal( 'rcid' );
+               $this->DeleteReasonList = $wgRequest->getText( 'wpDeleteReasonList', 'other' );
+               $this->DeleteReason = $wgRequest->getText( 'wpReason' );
 
-               if ( !$wgOut->getUser()->matchEditToken( $wgRequest->getVal( 'token' ), $rcid ) ) {
-                       $wgOut->showErrorPage( 'sessionfailure-title', 'sessionfailure' );
-                       return;
-               }
-
-               $rc = RecentChange::newFromId( $rcid );
-
-               if ( is_null( $rc ) ) {
-                       $wgOut->showErrorPage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
-                       return;
-               }
-
-               # 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;
-               }
-
-               if ( in_array( array( 'hookaborted' ), $errors ) ) {
-                       // The hook itself has handled any output
-                       return;
-               }
-
-               if ( in_array( array( 'markedaspatrollederror-noautopatrol' ), $errors ) ) {
-                       $wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) );
-                       $wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
-                       $wgOut->returnToMain( false, $return );
-
-                       return;
-               }
-
-               if ( !empty( $errors ) ) {
-                       $wgOut->showPermissionsErrorPage( $errors );
-
-                       return;
-               }
-
-               # Inform the user
-               $wgOut->setPageTitle( wfMsg( 'markedaspatrolled' ) );
-               $wgOut->addWikiMsg( 'markedaspatrolledtext', $rc->getTitle()->getPrefixedText() );
-               $wgOut->returnToMain( false, $return );
-       }
-
-       /**
-        * User-interface handler for the "watch" action
-        */
-       public function watch() {
-               global $wgOut;
-
-               if ( $wgOut->getUser()->isAnon() ) {
-                       $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
-                       return;
-               }
-
-               if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
-                       return;
-               }
-
-               if ( $this->doWatch() ) {
-                       $wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
-                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
-                       $wgOut->addWikiMsg( 'addedwatchtext', $this->mTitle->getPrefixedText() );
-               }
-
-               $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
-       }
-
-       /**
-        * Add this page to $wgUser's watchlist
-        *
-        * This is safe to be called multiple times
-        *
-        * @return bool true on successful watch operation
-        */
-       public function doWatch() {
-               global $wgUser;
-
-               if ( $wgUser->isAnon() ) {
-                       return false;
-               }
-
-               if ( wfRunHooks( 'WatchArticle', array( &$wgUser, &$this ) ) ) {
-                       $wgUser->addWatch( $this->mTitle );
-                       return wfRunHooks( 'WatchArticleComplete', array( &$wgUser, &$this ) );
-               }
-
-               return false;
-       }
-
-       /**
-        * User interface handler for the "unwatch" action.
-        */
-       public function unwatch() {
-               global $wgOut;
-
-               if ( $wgOut->getUser()->isAnon() ) {
-                       $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
-                       return;
-               }
-
-               if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
-                       return;
-               }
-
-               if ( $this->doUnwatch() ) {
-                       $wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
-                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
-                       $wgOut->addWikiMsg( 'removedwatchtext', $this->mTitle->getPrefixedText() );
-               }
-
-               $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
-       }
-
-       /**
-        * Stop watching a page
-        * @return bool true on successful unwatch
-        */
-       public function doUnwatch() {
-               global $wgUser;
-
-               if ( $wgUser->isAnon() ) {
-                       return false;
-               }
-
-               if ( wfRunHooks( 'UnwatchArticle', array( &$wgUser, &$this ) ) ) {
-                       $wgUser->removeWatch( $this->mTitle );
-                       return wfRunHooks( 'UnwatchArticleComplete', array( &$wgUser, &$this ) );
-               }
-
-               return false;
-       }
-
-       /**
-        * action=protect handler
-        */
-       public function protect() {
-               $form = new ProtectionForm( $this );
-               $form->execute();
-       }
-
-       /**
-        * action=unprotect handler (alias)
-        */
-       public function unprotect() {
-               $this->protect();
-       }
-
-       /**
-        * Update the article's restriction field, and leave a log entry.
-        *
-        * @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
-        */
-       public function updateRestrictions( $limit = array(), $reason = '', &$cascade = 0, $expiry = array() ) {
-               global $wgUser, $wgContLang;
-
-               $restrictionTypes = $this->mTitle->getRestrictionTypes();
-
-               $id = $this->mTitle->getArticleID();
-
-               if ( $id <= 0 ) {
-                       wfDebug( "updateRestrictions failed: article id $id <= 0\n" );
-                       return false;
-               }
-
-               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;
-               }
-
-               // Take this opportunity to purge out expired restrictions
-               Title::purgeExpiredRestrictions();
-
-               # FIXME: Same limitations as described in ProtectionForm.php (line 37);
-               # we expect a single selection, but the schema allows otherwise.
-               $current = array();
-               $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 );
-
-               $changed = ( $changed || $current != $updated );
-               $changed = $changed || ( $updated && $this->mTitle->areRestrictionsCascading() != $cascade );
-               $protect = ( $updated != '' );
-
-               # If nothing's changed, do nothing
-               if ( $changed ) {
-                       if ( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) {
-                               $dbw = wfGetDB( DB_MASTER );
-
-                               # 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() ) );
-
-                               # 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] = $dbw->getInfinity();
-
-                                       $encodedExpiry[$action] = $dbw->encodeExpiry( $expiry[$action] );
-                                       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 .= ') ';
-                                       }
-                               }
-                               $protect_description = trim( $protect_description );
-
-                               if ( $protect_description && $protect ) {
-                                       $editComment .= " ($protect_description)";
-                               }
-
-                               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 && $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 */
-                                               'page_touched' => $dbw->timestamp(),
-                                               'page_restrictions' => '',
-                                               'page_latest' => $nullRevId
-                                       ), array( /* WHERE */
-                                               '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 ) {
-                                       $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
-
-               return true;
-       }
-
-       /**
-        * Take an array of page restrictions and flatten it to a string
-        * suitable for insertion into the page_restrictions field.
-        * @param $limit Array
-        * @return String
-        */
-       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 != '' ) {
-                               $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 );
-               $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
-        */
-       public function delete() {
-               global $wgOut, $wgRequest;
-
-               $confirm = $wgRequest->wasPosted() &&
-                               $wgOut->getUser()->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
-
-               $this->DeleteReasonList = $wgRequest->getText( 'wpDeleteReasonList', 'other' );
-               $this->DeleteReason = $wgRequest->getText( 'wpReason' );
-
-               $reason = $this->DeleteReasonList;
+               $reason = $this->DeleteReasonList;
 
                if ( $reason != 'other' && $this->DeleteReason != '' ) {
                        // Entry from drop down menu + additional comment
@@ -2774,7 +1289,7 @@ class Article {
                }
 
                # Flag to hide all contents of the archived revisions
-               $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgOut->getUser()->isAllowed( 'suppressrevision' );
+               $suppress = $wgRequest->getVal( 'wpSuppress' ) && $this->getContext()->getUser()->isAllowed( 'suppressrevision' );
 
                # This code desperately needs to be totally rewritten
 
@@ -2786,7 +1301,7 @@ class Article {
                }
 
                # Check permissions
-               $permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgOut->getUser() );
+               $permission_errors = $this->getTitle()->getUserPermissionsErrors( 'delete', $this->getContext()->getUser() );
 
                if ( count( $permission_errors ) > 0 ) {
                        $wgOut->showPermissionsErrorPage( $permission_errors );
@@ -2794,33 +1309,34 @@ class Article {
                        return;
                }
 
-               $wgOut->setPagetitle( wfMsg( 'delete-confirm', $this->mTitle->getPrefixedText() ) );
+               $wgOut->setPagetitle( wfMsg( 'delete-confirm', $this->getTitle()->getPrefixedText() ) );
 
                # Better double-check that it hasn't been deleted yet!
                $dbw = wfGetDB( DB_MASTER );
-               $conds = $this->mTitle->pageCond();
+               $conds = $this->getTitle()->pageCond();
                $latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
                if ( $latest === false ) {
                        $wgOut->showFatalError(
                                Html::rawElement(
                                        'div',
                                        array( 'class' => 'error mw-error-cannotdelete' ),
-                                       wfMsgExt( 'cannotdelete', array( 'parse' ), $this->mTitle->getPrefixedText() )
+                                       wfMsgExt( 'cannotdelete', array( 'parse' ),
+                                               wfEscapeWikiText( $this->getTitle()->getPrefixedText() ) )
                                )
                        );
                        $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
                        LogEventsList::showLogExtract(
                                $wgOut,
                                'delete',
-                               $this->mTitle->getPrefixedText()
+                               $this->getTitle()->getPrefixedText()
                        );
 
                        return;
                }
 
                # Hack for big sites
-               $bigHistory = $this->isBigDeletion();
-               if ( $bigHistory && !$this->mTitle->userCan( 'bigdelete' ) ) {
+               $bigHistory = $this->mPage->isBigDeletion();
+               if ( $bigHistory && !$this->getTitle()->userCan( 'bigdelete' ) ) {
                        global $wgLang, $wgDeleteRevisionsLimit;
 
                        $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n",
@@ -2832,9 +1348,9 @@ class Article {
                if ( $confirm ) {
                        $this->doDelete( $reason, $suppress );
 
-                       if ( $wgRequest->getCheck( 'wpWatch' ) && $wgOut->getUser()->isLoggedIn() ) {
+                       if ( $wgRequest->getCheck( 'wpWatch' ) && $this->getContext()->getUser()->isLoggedIn() ) {
                                $this->doWatch();
-                       } elseif ( $this->mTitle->userIsWatching() ) {
+                       } elseif ( $this->getTitle()->userIsWatching() ) {
                                $this->doUnwatch();
                        }
 
@@ -2851,12 +1367,11 @@ class Article {
                if ( $hasHistory && !$confirm ) {
                        global $wgLang;
 
-                       $skin = $wgOut->getSkin();
-                       $revisions = $this->estimateRevisionCount();
-                       //FIXME: lego
+                       $revisions = $this->mPage->estimateRevisionCount();
+                       // @todo FIXME: i18n issue/patchwork message
                        $wgOut->addHTML( '<strong class="mw-delete-warning-revisions">' .
                                wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) .
-                               wfMsgHtml( 'word-separator' ) . $skin->link( $this->mTitle,
+                               wfMsgHtml( 'word-separator' ) . Linker::link( $this->getTitle(),
                                        wfMsgHtml( 'history' ),
                                        array( 'rel' => 'archives' ),
                                        array( 'action' => 'history' ) ) .
@@ -2873,89 +1388,9 @@ class Article {
                return $this->confirmDelete( $reason );
        }
 
-       /**
-        * @return bool whether or not the page surpasses $wgDeleteRevisionsLimit revisions
-        */
-       public function isBigDeletion() {
-               global $wgDeleteRevisionsLimit;
-
-               if ( $wgDeleteRevisionsLimit ) {
-                       $revCount = $this->estimateRevisionCount();
-
-                       return $revCount > $wgDeleteRevisionsLimit;
-               }
-
-               return false;
-       }
-
-       /**
-        * @return int approximate revision count
-        */
-       public function estimateRevisionCount() {
-               $dbr = wfGetDB( DB_SLAVE );
-
-               // 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 $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
-        */
-       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' ),
-                               array(
-                                       'page_namespace' => $this->mTitle->getNamespace(),
-                                       'page_title' => $this->mTitle->getDBkey(),
-                                       'rev_page = page_id'
-                               ), __METHOD__,
-                               array(
-                                       'ORDER BY' => 'rev_timestamp DESC',
-                                       '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--;
-                       } else {
-                               $continue = 0;
-                       }
-               } while ( $continue );
-
-               $authors = array( $row->rev_user_text );
-
-               foreach ( $res as $row ) {
-                       $authors[] = $row->rev_user_text;
-               }
-
-               wfProfileOut( __METHOD__ );
-               return $authors;
-       }
-
        /**
         * Output deletion confirmation dialog
-        * FIXME: Move to another file?
+        * @todo FIXME: Move to another file?
         * @param $reason String: prefilled reason
         */
        public function confirmDelete( $reason ) {
@@ -2963,14 +1398,14 @@ class Article {
 
                wfDebug( "Article::confirmDelete\n" );
 
-               $deleteBackLink = $wgOut->getSkin()->linkKnown( $this->mTitle );
+               $deleteBackLink = Linker::linkKnown( $this->getTitle() );
                $wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $deleteBackLink ) );
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
                $wgOut->addWikiMsg( 'confirmdeletetext' );
 
                wfRunHooks( 'ArticleConfirmDelete', array( $this, $wgOut, &$reason ) );
 
-               if ( $wgOut->getUser()->isAllowed( 'suppressrevision' ) ) {
+               if ( $this->getContext()->getUser()->isAllowed( 'suppressrevision' ) ) {
                        $suppress = "<tr id=\"wpDeleteSuppressRow\">
                                        <td></td>
                                        <td class='mw-input'><strong>" .
@@ -2981,10 +1416,10 @@ class Article {
                } else {
                        $suppress = '';
                }
-               $checkWatch = $wgOut->getUser()->getBoolOption( 'watchdeletion' ) || $this->mTitle->userIsWatching();
+               $checkWatch = $this->getContext()->getUser()->getBoolOption( 'watchdeletion' ) || $this->getTitle()->userIsWatching();
 
                $form = Xml::openElement( 'form', array( 'method' => 'post',
-                       'action' => $this->mTitle->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) .
+                       'action' => $this->getTitle()->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' ) ) .
@@ -3014,7 +1449,7 @@ class Article {
                        </tr>";
 
                # Disallow watching if user is not logged in
-               if ( $wgOut->getUser()->isLoggedIn() ) {
+               if ( $this->getContext()->getUser()->isLoggedIn() ) {
                        $form .= "
                        <tr>
                                <td></td>
@@ -3028,656 +1463,76 @@ class Article {
                $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', $wgOut->getUser()->editToken() ) .
-                       Xml::closeElement( 'form' );
-
-                       if ( $wgOut->getUser()->isAllowed( 'editinterface' ) ) {
-                               $skin = $wgOut->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>';
-                       }
-
-               $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
-        */
-       public function doDelete( $reason, $suppress = false ) {
-               global $wgOut;
-
-               $id = $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE );
-
-               $error = '';
-               if ( $this->doDeleteArticle( $reason, $suppress, $id, $error ) ) {
-                       $deleted = $this->mTitle->getPrefixedText();
-
-                       $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
-                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
-
-                       $loglink = '[[Special:Log/delete|' . wfMsgNoTrans( 'deletionlog' ) . ']]';
-
-                       $wgOut->addWikiMsg( 'deletedtext', $deleted, $loglink );
-                       $wgOut->returnToMain( false );
-               } 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( $error );
-                       }
-               }
-       }
-
-       /**
-        * Back-end article deletion
-        * Deletes the article with database consistency, writes logs, purges caches
-        *
-        * @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
-        */
-       public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true, &$error = '' ) {
-               global $wgDeferredUpdateList, $wgUseTrackbacks;
-               global $wgUser;
-
-               wfDebug( __METHOD__ . "\n" );
-
-               if ( ! wfRunHooks( 'ArticleDelete', array( &$this, &$wgUser, &$reason, &$error ) ) ) {
-                       return false;
-               }
-               $dbw = wfGetDB( DB_MASTER );
-               $t = $this->mTitle->getDBkey();
-               $id = $id ? $id : $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE );
-
-               if ( $t === '' || $id == 0 ) {
-                       return false;
-               }
-
-               $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
-               // immutable storage schemes.
-               //
-               // For backwards compatibility, note that some older archive
-               // table entries will have ar_text and ar_flags fields still.
-               //
-               // In the future, we may keep revisions and mark them with
-               // the rev_deleted field, which is reserved for this purpose.
-               $dbw->insertSelect( 'archive', array( 'page', 'revision' ),
-                       array(
-                               'ar_namespace'  => 'page_namespace',
-                               'ar_title'      => 'page_title',
-                               'ar_comment'    => 'rev_comment',
-                               'ar_user'       => 'rev_user',
-                               'ar_user_text'  => 'rev_user_text',
-                               'ar_timestamp'  => 'rev_timestamp',
-                               'ar_minor_edit' => 'rev_minor_edit',
-                               'ar_rev_id'     => 'rev_id',
-                               'ar_text_id'    => 'rev_text_id',
-                               'ar_text'       => '\'\'', // Be explicit to appease
-                               'ar_flags'      => '\'\'', // MySQL's "strict mode"...
-                               'ar_len'        => 'rev_len',
-                               'ar_page_id'    => 'page_id',
-                               'ar_deleted'    => $bitfield
-                       ), array(
-                               'page_id' => $id,
-                               'page_id = rev_page'
-                       ), __METHOD__
-               );
-
-               # Delete restrictions for it
-               $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__ );
-               $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 )
-                               $dbw->delete( 'trackbacks', array( 'tb_page' => $id ), __METHOD__ );
-
-                       # Delete outgoing links
-                       $dbw->delete( 'pagelinks', array( 'pl_from' => $id ) );
-                       $dbw->delete( 'imagelinks', array( 'il_from' => $id ) );
-                       $dbw->delete( 'categorylinks', array( 'cl_from' => $id ) );
-                       $dbw->delete( 'templatelinks', array( 'tl_from' => $id ) );
-                       $dbw->delete( 'externallinks', array( 'el_from' => $id ) );
-                       $dbw->delete( 'langlinks', array( 'll_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_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 );
-
-               # Clear the cached article id so the interface doesn't act like we exist
-               $this->mTitle->resetArticleID( 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();
-               }
-
-               wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$wgUser, $reason, $id ) );
-               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. This function
-        * performs permissions checks on $wgUser, then calls commitRollback()
-        * to do the dirty work
-        *
-        * @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;
-
-               $resultDetails = null;
-
-               # 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 ( $wgUser->pingLimiter( 'rollback' ) || $wgUser->pingLimiter() ) {
-                       $errors[] = array( 'actionthrottledtext' );
-               }
-
-               # If there were errors, bail out now
-               if ( !empty( $errors ) ) {
-                       return $errors;
-               }
-
-               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 ) ) {
-                       # Something wrong... no page?
-                       return array( array( 'notanarticle' ) );
-               }
-
-               $from = str_replace( '_', ' ', $fromP );
-               # 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 array( array( 'alreadyrolled',
-                               htmlspecialchars( $this->mTitle->getPrefixedText() ),
-                               htmlspecialchars( $fromP ),
-                               htmlspecialchars( $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', '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' )
-                       );
-               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 && $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 ( count( $set ) ) {
-                       $dbw->update( 'recentchanges', $set,
-                               array( /* WHERE */
-                                       'rc_cur_id' => $current->getPage(),
-                                       'rc_user_text' => $current->getUserText(),
-                                       "rc_timestamp > '{$s->rev_timestamp}'",
-                               ), __METHOD__
-                       );
-               }
-
-               # Generate the edit summary if necessary
-               $target = Revision::newFromId( $s->rev_id );
-               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;
-
-               if ( $wgUser->isAllowed( 'minoredit' ) ) {
-                       $flags |= EDIT_MINOR;
-               }
-
-               if ( $bot && ( $wgUser->isAllowedAny( 'markbotedits', 'bot' ) ) ) {
-                       $flags |= EDIT_FORCE_BOT;
-               }
-
-               # 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,
-                       'newid'   => $revId
-               );
-
-               return array();
-       }
-
-       /**
-        * User interface for rollback operations
-        */
-       public function rollback() {
-               global $wgUser, $wgOut, $wgRequest;
-
-               $details = null;
-
-               $result = $this->doRollback(
-                       $wgRequest->getVal( 'from' ),
-                       $wgRequest->getText( 'summary' ),
-                       $wgRequest->getVal( 'token' ),
-                       $wgRequest->getBool( 'bot' ),
-                       $details
-               );
-
-               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'];
-
-                               if ( $current->getComment() != '' ) {
-                                       $wgOut->addWikiMsgArray( 'editcomment', array(
-                                               $wgUser->getSkin()->formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
-                               }
-                       }
-
-                       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
-        */
-       public function viewUpdates() {
-               global $wgDeferredUpdateList, $wgDisableCounters, $wgUser;
-               if ( wfReadOnly() ) {
-                       return;
-               }
-
-               # Don't update page view counters on views from bot users (bug 14044)
-               if ( !$wgDisableCounters && !$wgUser->isAllowed( 'bot' ) && $this->getID() ) {
-                       $wgDeferredUpdateList[] = new ViewCountUpdate( $this->getID() );
-                       $wgDeferredUpdateList[] = new SiteStatsUpdate( 1, 0, 0 );
-               }
-
-               # 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, User $user = null ) {
-               if ( $this->mPreparedEdit && $this->mPreparedEdit->newText == $text && $this->mPreparedEdit->revid == $revid ) {
-                       // Already prepared
-                       return $this->mPreparedEdit;
-               }
-
-               global $wgParser;
-
-               if( $user === null ) {
-                       global $wgUser;
-                       $user = $wgUser;
-               }
-               $popts = ParserOptions::newFromUser( $user );
-               wfRunHooks( 'ArticlePrepareTextForEdit', array( $this, $popts ) );
-
-               $edit = (object)array();
-               $edit->revid = $revid;
-               $edit->newText = $text;
-               $edit->pst = $this->preSaveTransform( $text, $user, $popts );
-               $edit->popts = $this->getParserOptions();
-               $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $edit->popts, true, true, $revid );
-               $edit->oldText = $this->getRawText();
+                               <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', $this->getContext()->getUser()->editToken() ) .
+                       Xml::closeElement( 'form' );
 
-               $this->mPreparedEdit = $edit;
+                       if ( $this->getContext()->getUser()->isAllowed( 'editinterface' ) ) {
+                               $title = Title::makeTitle( NS_MEDIAWIKI, 'Deletereason-dropdown' );
+                               $link = Linker::link(
+                                       $title,
+                                       wfMsgHtml( 'delete-edit-reasonlist' ),
+                                       array(),
+                                       array( 'action' => 'edit' )
+                               );
+                               $form .= '<p class="mw-delete-editreasons">' . $link . '</p>';
+                       }
 
-               return $edit;
+               $wgOut->addHTML( $form );
+               $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+               LogEventsList::showLogExtract( $wgOut, 'delete',
+                       $this->getTitle()->getPrefixedText()
+               );
        }
 
        /**
-        * 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 String: New text of the article
-        * @param $summary String: Edit summary
-        * @param $minoredit Boolean: Minor edit
-        * @param $timestamp_of_pagechange String timestamp associated with the page change
-        * @param $newid Integer: rev_id value of the new revision
-        * @param $changed Boolean: Whether or not the content actually changed
-        * @param $user User object: User doing the edit
+        * Perform a deletion and output success or failure messages
         */
-       public function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true, User $user = null ) {
-               global $wgDeferredUpdateList, $wgUser, $wgEnableParserCache;
-
-               wfProfileIn( __METHOD__ );
-
-               # Parse the text
-               # 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, $user );
-               } else {
-                       wfDebug( __METHOD__ . ": No vary-revision, using prepared edit...\n" );
-                       $editInfo = $this->mPreparedEdit;
-               }
+       public function doDelete( $reason, $suppress = false ) {
+               global $wgOut;
 
-               # Save it to the parser cache
-               if ( $wgEnableParserCache ) {
-                       $parserCache = ParserCache::singleton();
-                       $parserCache->save( $editInfo->output, $this, $editInfo->popts );
-               }
+               $id = $this->getTitle()->getArticleID( Title::GAID_FOR_UPDATE );
 
-               # Update the links tables
-               $u = new LinksUpdate( $this->mTitle, $editInfo->output );
-               $u->doUpdate();
+               $error = '';
+               if ( $this->mPage->doDeleteArticle( $reason, $suppress, $id, $error ) ) {
+                       $deleted = $this->getTitle()->getPrefixedText();
 
-               wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $changed ) );
+                       $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
+                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
 
-               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;
+                       $loglink = '[[Special:Log/delete|' . wfMsgNoTrans( 'deletionlog' ) . ']]';
 
-                               $dbw = wfGetDB( DB_MASTER );
-                               $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
-                               $dbw->delete(
-                                       'recentchanges',
-                                       array( "rc_timestamp < '$cutoff'" ),
-                                       __METHOD__
+                       $wgOut->addWikiMsg( 'deletedtext', wfEscapeWikiText( $deleted ), $loglink );
+                       $wgOut->returnToMain( false );
+               } else {
+                       if ( $error == '' ) {
+                               $wgOut->showFatalError(
+                                       Html::rawElement(
+                                               'div',
+                                               array( 'class' => 'error mw-error-cannotdelete' ),
+                                               wfMsgExt( 'cannotdelete', array( 'parse' ),
+                                                       wfEscapeWikiText( $this->getTitle()->getPrefixedText() ) )
+                                       )
                                );
-                       }
-               }
-
-               $id = $this->getID();
-               $title = $this->mTitle->getPrefixedDBkey();
-               $shortTitle = $this->mTitle->getDBkey();
 
-               if ( 0 == $id ) {
-                       wfProfileOut( __METHOD__ );
-                       return;
-               }
+                               $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
 
-               $u = new SiteStatsUpdate( 0, 1, $this->mGoodAdjustment, $this->mTotalAdjustment );
-               array_push( $wgDeferredUpdateList, $u );
-               $u = new SearchUpdate( $id, $title, $text );
-               array_push( $wgDeferredUpdateList, $u );
-
-               # If this is another user's talk page, update newtalk
-               # 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, false );
-                               if ( !$other ) {
-                                       wfDebug( __METHOD__ . ": invalid username\n" );
-                               } elseif ( User::isIP( $shortTitle ) ) {
-                                       // An anonymous user
-                                       $other->setNewtalk( true );
-                               } elseif ( $other->isLoggedIn() ) {
-                                       $other->setNewtalk( true );
-                               } else {
-                                       wfDebug( __METHOD__ . ": don't need to notify a nonexistent user\n" );
-                               }
+                               LogEventsList::showLogExtract(
+                                       $wgOut,
+                                       'delete',
+                                       $this->getTitle()->getPrefixedText()
+                               );
+                       } else {
+                               $wgOut->showFatalError( $error );
                        }
                }
-
-               if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                       MessageCache::singleton()->replace( $shortTitle, $text );
-               }
-
-               wfProfileOut( __METHOD__ );
-       }
-
-       /**
-        * Perform article updates on a special page creation.
-        *
-        * @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.
-        */
-       public function createUpdates( $rev ) {
-               $this->mGoodAdjustment = $this->isCountable( $rev->getText() );
-               $this->mTotalAdjustment = 1;
-               $this->editUpdates( $rev->getText(), $rev->getComment(),
-                       $rev->isMinor(), wfTimestamp(), $rev->getId(), true );
        }
 
        /**
@@ -3704,16 +1559,17 @@ class Article {
                }
 
                $revision = Revision::newFromId( $oldid );
+               $timestamp = $revision->getTimestamp();
+
+               $current = ( $oldid == $this->mPage->getLatest() );
+               $td = $wgLang->timeanddate( $timestamp, true );
+               $tddate = $wgLang->date( $timestamp, true );
+               $tdtime = $wgLang->time( $timestamp, true );
 
-               $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
                        ? wfMsgHtml( 'currentrevisionlink' )
-                       : $sk->link(
-                               $this->mTitle,
+                       : Linker::link(
+                               $this->getTitle(),
                                wfMsgHtml( 'currentrevisionlink' ),
                                array(),
                                $extraParams,
@@ -3721,8 +1577,8 @@ class Article {
                        );
                $curdiff = $current
                        ? wfMsgHtml( 'diff' )
-                       : $sk->link(
-                               $this->mTitle,
+                       : Linker::link(
+                               $this->getTitle(),
                                wfMsgHtml( 'diff' ),
                                array(),
                                array(
@@ -3731,10 +1587,10 @@ class Article {
                                ) + $extraParams,
                                array( 'known', 'noclasses' )
                        );
-               $prev = $this->mTitle->getPreviousRevisionID( $oldid ) ;
+               $prev = $this->getTitle()->getPreviousRevisionID( $oldid ) ;
                $prevlink = $prev
-                       ? $sk->link(
-                               $this->mTitle,
+                       ? Linker::link(
+                               $this->getTitle(),
                                wfMsgHtml( 'previousrevision' ),
                                array(),
                                array(
@@ -3745,8 +1601,8 @@ class Article {
                        )
                        : wfMsgHtml( 'previousrevision' );
                $prevdiff = $prev
-                       ? $sk->link(
-                               $this->mTitle,
+                       ? Linker::link(
+                               $this->getTitle(),
                                wfMsgHtml( 'diff' ),
                                array(),
                                array(
@@ -3758,8 +1614,8 @@ class Article {
                        : wfMsgHtml( 'diff' );
                $nextlink = $current
                        ? wfMsgHtml( 'nextrevision' )
-                       : $sk->link(
-                               $this->mTitle,
+                       : Linker::link(
+                               $this->getTitle(),
                                wfMsgHtml( 'nextrevision' ),
                                array(),
                                array(
@@ -3770,8 +1626,8 @@ class Article {
                        );
                $nextdiff = $current
                        ? wfMsgHtml( 'diff' )
-                       : $sk->link(
-                               $this->mTitle,
+                       : Linker::link(
+                               $this->getTitle(),
                                wfMsgHtml( 'diff' ),
                                array(),
                                array(
@@ -3787,492 +1643,97 @@ class Article {
                $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
+                               $cdel = Linker::revDeleteLinkDisabled( $canHide ); // rev was hidden from Sysops
                        } else {
                                $query = array(
                                        'type'   => 'revision',
-                                       'target' => $this->mTitle->getPrefixedDbkey(),
+                                       'target' => $this->getTitle()->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 );
-
-               $infomsg = $current && !wfMessage( 'revision-info-current' )->isDisabled()
-                       ? 'revision-info-current'
-                       : 'revision-info';
-
-               $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->addHTML( $r );
-       }
-
-       /**
-        * This function is called right before saving the wikitext,
-        * so we can do things like signatures and links-in-context.
-        *
-        * @param $text String article contents
-        * @param $user User object: user doing the edit, $wgUser will be used if
-        *              null is given
-        * @param $popts ParserOptions object: parser options, default options for
-        *               the user loaded if null given
-        * @return string article contents with altered wikitext markup (signatures
-        *      converted, {{subst:}}, templates, etc.)
-        */
-       public function preSaveTransform( $text, User $user = null, ParserOptions $popts = null ) {
-               global $wgParser;
-
-               if ( $user === null ) {
-                       global $wgUser;
-                       $user = $wgUser;
-               }
-
-               if ( $popts === null ) {
-                       $popts = ParserOptions::newFromUser( $user );
-               }
-
-               return $wgParser->preSaveTransform( $text, $this->mTitle, $user, $popts );
-       }
-
-       /* Caching functions */
-
-       /**
-        * 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
-        */
-       protected function tryFileCache() {
-               static $called = false;
-
-               if ( $called ) {
-                       wfDebug( "Article::tryFileCache(): called twice!?\n" );
-                       return false;
-               }
-
-               $called = true;
-               if ( $this->isFileCacheable() ) {
-                       $cache = new HTMLFileCache( $this->mTitle );
-                       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' ) );
-                       }
-               } else {
-                       wfDebug( "Article::tryFileCache(): not cacheable\n" );
-               }
-
-               return false;
-       }
-
-       /**
-        * Check if the page can be cached
-        * @return bool
-        */
-       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;
-       }
-
-       /**
-        * Loads page_touched and returns a value indicating if it should be used
-        * @return boolean true if not a redirect
-        */
-       public function checkTouched() {
-               if ( !$this->mDataLoaded ) {
-                       $this->loadPageData();
-               }
-
-               return !$this->mIsRedirect;
-       }
-
-       /**
-        * Get the page_touched field
-        * @return string containing GMT timestamp
-        */
-       public function getTouched() {
-               if ( !$this->mDataLoaded ) {
-                       $this->loadPageData();
-               }
-
-               return $this->mTouched;
-       }
-
-       /**
-        * Get the page_latest field
-        * @return integer rev_id of current revision
-        */
-       public function getLatest() {
-               if ( !$this->mDataLoaded ) {
-                       $this->loadPageData();
-               }
-
-               return (int)$this->mLatest;
-       }
-
-       /**
-        * Edit an article without doing all that other stuff
-        * The article must already exist; link tables etc
-        * are not updated, caches are not flushed.
-        *
-        * @param $text String: text submitted
-        * @param $comment String: comment submitted
-        * @param $minor Boolean: whereas it's a minor modification
-        */
-       public function quickEdit( $text, $comment = '', $minor = 0 ) {
-               wfProfileIn( __METHOD__ );
-
-               $dbw = wfGetDB( DB_MASTER );
-               $revision = new Revision( array(
-                       'page'       => $this->getId(),
-                       'text'       => $text,
-                       'comment'    => $comment,
-                       'minor_edit' => $minor ? 1 : 0,
-                       ) );
-               $revision->insertOn( $dbw );
-               $this->updateRevisionOn( $dbw, $revision );
-
-               global $wgUser;
-               wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $wgUser ) );
-
-               wfProfileOut( __METHOD__ );
-       }
-
-       /**
-        * The onArticle*() functions are supposed to be a kind of hooks
-        * which should be called whenever any of the specified actions
-        * are done.
-        *
-        * 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
-        *
-        * @param $title Title object
-        */
-       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();
-       }
-
-       /**
-        * Clears caches when article is deleted
-        */
-       public static function onArticleDelete( $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();
-
-               # File cache
-               HTMLFileCache::clearFileCache( $title );
-
-               # Messages
-               if ( $title->getNamespace() == NS_MEDIAWIKI ) {
-                       MessageCache::singleton()->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
-        */
-       public static function onArticleEdit( $title ) {
-               global $wgDeferredUpdateList;
-
-               // Invalidate caches of articles which include this page
-               $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 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() {
-               global $wgLang, $wgOut, $wgAllowPageInfo, $wgUser;
-
-               if ( !$wgAllowPageInfo ) {
-                       $wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
-                       return;
-               }
-
-               $page = $this->mTitle->getSubjectPage();
-
-               $wgOut->setPagetitle( $page->getPrefixedText() );
-               $wgOut->setPageTitleActionText( wfMsg( 'info_short' ) );
-               $wgOut->setSubtitle( wfMsgHtml( 'infosubtitle' ) );
-
-               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( $this->mTitle->getDefaultMessageText() ) );
-                       } else {
-                               $msg = $wgUser->isLoggedIn()
-                                       ? 'noarticletext'
-                                       : 'noarticletextanon';
-                               $wgOut->addHTML( wfMsgExt( $msg, 'parse' ) );
-                       }
-
-                       $wgOut->addHTML( '</div>' );
-               } else {
-                       $dbr = wfGetDB( DB_SLAVE );
-                       $wl_clause = array(
-                               'wl_title'     => $page->getDBkey(),
-                               'wl_namespace' => $page->getNamespace() );
-                       $numwatchers = $dbr->selectField(
-                               'watchlist',
-                               'COUNT(*)',
-                               $wl_clause,
-                               __METHOD__ );
-
-                       $pageInfo = $this->pageCountInfo( $page );
-                       $talkInfo = $this->pageCountInfo( $page->getTalkPage() );
-
-
-                       //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>' );
+                               );
+                               $cdel = Linker::revDeleteLink( $query, $revision->isDeleted( File::DELETED_RESTRICTED ), $canHide );
                        }
-
-                       $wgOut->addHTML( '</ul>' );
+                       $cdel .= ' ';
                }
-       }
 
-       /**
-        * 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 object
-        * @return mixed array or boolean false
-        */
-       public function pageCountInfo( $title ) {
-               $id = $title->getArticleId();
+               # Show user links if allowed to see them. If hidden, then show them only if requested...
+               $userlinks = Linker::revUserTools( $revision, !$unhide );
 
-               if ( $id == 0 ) {
-                       return false;
-               }
+               $infomsg = $current && !wfMessage( 'revision-info-current' )->isDisabled()
+                       ? 'revision-info-current'
+                       : 'revision-info';
 
-               $dbr = wfGetDB( DB_SLAVE );
-               $rev_clause = array( 'rev_page' => $id );
-               $edits = $dbr->selectField(
-                       'revision',
-                       'COUNT(rev_page)',
-                       $rev_clause,
-                       __METHOD__
-               );
-               $authors = $dbr->selectField(
-                       'revision',
-                       'COUNT(DISTINCT rev_user_text)',
-                       $rev_clause,
-                       __METHOD__
-               );
+               $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";
 
-               return array( 'edits' => $edits, 'authors' => $authors );
+               $wgOut->setSubtitle( $r );
        }
 
+       /* Caching functions */
+
        /**
-        * Return a list of templates used by this article.
-        * Uses the templatelinks table
+        * 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 Array of Title objects
+        * @return boolean true if cached version send, false otherwise
         */
-       public function getUsedTemplates() {
-               $result = array();
-               $id = $this->mTitle->getArticleID();
+       protected function tryFileCache() {
+               static $called = false;
 
-               if ( $id == 0 ) {
-                       return array();
+               if ( $called ) {
+                       wfDebug( "Article::tryFileCache(): called twice!?\n" );
+                       return false;
                }
 
-               $dbr = wfGetDB( DB_SLAVE );
-               $res = $dbr->select( array( 'templatelinks' ),
-                       array( 'tl_namespace', 'tl_title' ),
-                       array( 'tl_from' => $id ),
-                       __METHOD__ );
-
-               if ( $res !== false ) {
-                       foreach ( $res as $row ) {
-                               $result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title );
+               $called = true;
+               if ( $this->isFileCacheable() ) {
+                       $cache = new HTMLFileCache( $this->getTitle() );
+                       if ( $cache->isFileCacheGood( $this->mPage->getTouched() ) ) {
+                               wfDebug( "Article::tryFileCache(): about to load file\n" );
+                               $cache->loadFromFileCache();
+                               return true;
+                       } else {
+                               wfDebug( "Article::tryFileCache(): starting buffer\n" );
+                               ob_start( array( &$cache, 'saveToFileCache' ) );
                        }
+               } else {
+                       wfDebug( "Article::tryFileCache(): not cacheable\n" );
                }
 
-               return $result;
+               return false;
        }
 
        /**
-        * Returns a list of hidden categories this page is a member of.
-        * Uses the page_props and categorylinks tables.
-        *
-        * @return Array of Title objects
+        * Check if the page can be cached
+        * @return bool
         */
-       public function getHiddenCategories() {
-               $result = array();
-               $id = $this->mTitle->getArticleID();
-
-               if ( $id == 0 ) {
-                       return array();
-               }
+       public function isFileCacheable() {
+               $cacheable = false;
 
-               $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 );
+               if ( HTMLFileCache::useFileCache() ) {
+                       $cacheable = $this->mPage->getID() && !$this->mRedirectedFrom && !$this->getTitle()->isRedirect();
+                       // Extension may have reason to disable file caching on some pages.
+                       if ( $cacheable ) {
+                               $cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) );
                        }
                }
 
-               return $result;
+               return $cacheable;
        }
 
-       /**
-       * Return an applicable autosummary if one exists for the given edit.
-       * @param $oldtext String: the previous text of the page.
-       * @param $newtext String: The submitted text of the page.
-       * @param $flags Int 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 );
-
-               if ( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) {
-                       return wfMsgForContent( 'autoredircomment', $rt->getFullText() );
-               }
-
-               # New page autosummaries
-               if ( $flags & EDIT_NEW && strlen( $newtext ) ) {
-                       # If they're making a new article, give its text, truncated, in the summary.
-
-                       $truncatedtext = $wgContLang->truncate(
-                               str_replace( "\n", ' ', $newtext ),
-                               max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new' ) ) ) );
-
-                       return wfMsgForContent( 'autosumm-new', $truncatedtext );
-               }
-
-               # 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
-
-                       $truncatedtext = $wgContLang->truncate(
-                               $newtext,
-                               max( 0, 200 - strlen( wfMsgForContent( 'autosumm-replace' ) ) ) );
-
-                       return wfMsgForContent( 'autosumm-replace', $truncatedtext );
-               }
-
-               # If we reach this point, there's no applicable autosummary for our case, so our
-               # autosummary is empty.
-               return '';
-       }
+       /**#@-*/
 
        /**
         * Add the primary page-view wikitext to the output buffer
@@ -4287,9 +1748,65 @@ class Article {
                global $wgOut;
 
                $this->mParserOutput = $this->getOutputFromWikitext( $text, $cache, $parserOptions );
+
+               $this->doCascadeProtectionUpdates( $this->mParserOutput );
+
                $wgOut->addParserOutput( $this->mParserOutput );
        }
 
+       /**
+        * 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 WikiPage::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
+        * @param $user User The relevant user
+        * @return ParserOutput or false if the given revsion ID is not found
+        */
+       public function getParserOutput( $oldid = null, User $user = null ) {
+               global $wgEnableParserCache, $wgUser;
+               $user = is_null( $user ) ? $wgUser : $user;
+
+               wfProfileIn( __METHOD__ );
+               // Should the parser cache be used?
+               $useParserCache = $wgEnableParserCache &&
+                       $user->getStubThreshold() == 0 &&
+                       $this->mPage->exists() &&
+                       $oldid === null;
+
+               wfDebug( __METHOD__ . ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
+
+               if ( $user->getStubThreshold() ) {
+                       wfIncrStats( 'pcache_miss_stub' );
+               }
+
+               if ( $useParserCache ) {
+                       $parserOutput = ParserCache::singleton()->get( $this, $this->mPage->getParserOptions() );
+                       if ( $parserOutput !== false ) {
+                               wfProfileOut( __METHOD__ );
+                               return $parserOutput;
+                       }
+               }
+
+               // Cache miss; parse and output it.
+               if ( $oldid === null ) {
+                       $text = $this->mPage->getRawText();
+               } else {
+                       $rev = Revision::newFromTitle( $this->getTitle(), $oldid );
+                       if ( $rev === null ) {
+                               wfProfileOut( __METHOD__ );
+                               return false;
+                       }
+                       $text = $rev->getText();
+               }
+
+               $output = $this->getOutputFromWikitext( $text, $useParserCache );
+               wfProfileOut( __METHOD__ );
+               return $output;
+       }
+
        /**
         * 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,
@@ -4298,24 +1815,24 @@ class Article {
         * @param $text string
         * @param $cache boolean
         * @param $parserOptions parsing options, defaults to false
-        * @return string containing parsed output
+        * @return ParserOutput
         */
        public function getOutputFromWikitext( $text, $cache = true, $parserOptions = false ) {
                global $wgParser, $wgEnableParserCache, $wgUseFileCache;
 
                if ( !$parserOptions ) {
-                       $parserOptions = $this->getParserOptions();
+                       $parserOptions = $this->mPage->getParserOptions();
                }
 
                $time = - wfTime();
-               $this->mParserOutput = $wgParser->parse( $text, $this->mTitle,
+               $this->mParserOutput = $wgParser->parse( $text, $this->getTitle(),
                        $parserOptions, true, true, $this->getRevIdFetched() );
                $time += wfTime();
 
                # Timing hack
                if ( $time > 3 ) {
                        wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time,
-                               $this->mTitle->getPrefixedDBkey() ) );
+                               $this->getTitle()->getPrefixedDBkey() ) );
                }
 
                if ( $wgEnableParserCache && $cache && $this->mParserOutput->isCacheable() ) {
@@ -4330,217 +1847,139 @@ class Article {
                        $wgUseFileCache = false;
                }
 
-               $this->doCascadeProtectionUpdates( $this->mParserOutput );
+               if ( $this->isCurrent() ) {
+                       $this->mPage->doCascadeProtectionUpdates( $this->mParserOutput );
+               }
 
                return $this->mParserOutput;
        }
 
        /**
-        * Get parser options suitable for rendering the primary article wikitext
-        * @return mixed ParserOptions object or boolean false
+        * Sets the context this Article is executed in
+        *
+        * @param $context IContextSource
+        * @since 1.18
         */
-       public function getParserOptions() {
-               global $wgUser;
-
-               if ( !$this->mParserOptions ) {
-                       $this->mParserOptions = new ParserOptions( $wgUser );
-                       $this->mParserOptions->setTidy( true );
-                       $this->mParserOptions->enableLimitReport();
-               }
-
-               // Clone to allow modifications of the return value without affecting
-               // the cache
-               return clone $this->mParserOptions;
+       public function setContext( $context ) {
+               $this->mContext = $context;
        }
 
        /**
-        * Updates cascading protections
+        * Gets the context this Article is executed in
         *
-        * @param $parserOutput mixed ParserOptions object, or boolean false
-        **/
-       protected function doCascadeProtectionUpdates( $parserOutput ) {
-               if ( !$this->isCurrent() || wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) {
-                       return;
-               }
-
-               // 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.
-
-               # Get templates from templatelinks
-               $id = $this->mTitle->getArticleID();
-
-               $tlTemplates = array();
-
-               $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;
-                       }
-               }
-
-               # 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();
+        * @return IContextSource
+        * @since 1.18
+        */
+       public function getContext() {
+               if ( $this->mContext instanceof IContextSource ) {
+                       return $this->mContext;
+               } else {
+                       wfDebug( __METHOD__ . " called and \$mContext is null. Return RequestContext::getMain(); for sanity\n" );
+                       return RequestContext::getMain();
                }
        }
 
        /**
-        * Update all the appropriate counts in the category table, given that
-        * we've added the categories $added and deleted the categories $deleted.
+        * Use PHP's magic __get handler to handle accessing of
+        * raw WikiPage fields for backwards compatibility.
         *
-        * @param $added array   The names of categories that were added
-        * @param $deleted array The names of categories that were deleted
+        * @param $fname String Field name
         */
-       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__
-                       );
+       public function __get( $fname ) {
+               if ( property_exists( $this->mPage, $fname ) ) {
+                       #wfWarn( "Access to raw $fname field " . __CLASS__ );
+                       return $this->mPage->$fname;
                }
+               trigger_error( 'Inaccessible property via __get(): ' . $fname, E_USER_NOTICE );
+       }
 
-               if ( $deleted ) {
-                       $dbw->update(
-                               'category',
-                               $removeFields,
-                               array( 'cat_title' => $deleted ),
-                               __METHOD__
-                       );
+       /**
+        * Use PHP's magic __set handler to handle setting of
+        * raw WikiPage fields for backwards compatibility.
+        *
+        * @param $fname String Field name
+        * @param $fvalue mixed New value
+        */
+       public function __set( $fname, $fvalue ) {
+               if ( property_exists( $this->mPage, $fname ) ) {
+                       #wfWarn( "Access to raw $fname field of " . __CLASS__ );
+                       $this->mPage->$fname = $fvalue;
+               // Note: extensions may want to toss on new fields
+               } elseif ( !in_array( $fname, array( 'mContext', 'mPage' ) ) ) {
+                       $this->mPage->$fname = $fvalue;
+               } else {
+                       trigger_error( 'Inaccessible property via __set(): ' . $fname, E_USER_NOTICE );
                }
        }
 
        /**
-        * 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
+        * Use PHP's magic __call handler to transform instance calls to
+        * WikiPage functions for backwards compatibility.
         *
-        * @param $oldid mixed integer Revision ID or null
-        * @return ParserOutput or false if the given revsion ID is not found
+        * @param $fname String Name of called method
+        * @param $args Array Arguments to the method
         */
-       public function getParserOutput( $oldid = null ) {
-               global $wgEnableParserCache, $wgUser;
+       public function __call( $fname, $args ) {
+               if ( is_callable( array( $this->mPage, $fname ) ) ) {
+                       #wfWarn( "Call to " . __CLASS__ . "::$fname; please use WikiPage instead" );
+                       return call_user_func_array( array( $this->mPage, $fname ), $args );
+               }
+               trigger_error( 'Inaccessible function via __call(): ' . $fname, E_USER_ERROR );
+       }
 
-               // Should the parser cache be used?
-               $useParserCache = $wgEnableParserCache &&
-                       $wgUser->getStubThreshold() == 0 &&
-                       $this->exists() &&
-                       $oldid === null;
+       // ****** B/C functions to work-around PHP silliness with __call and references ****** //
+       public function updateRestrictions( $limit = array(), $reason = '', &$cascade = 0, $expiry = array() ) {
+               return $this->mPage->updateRestrictions( $limit, $reason, $cascade, $expiry );
+       }
 
-               wfDebug( __METHOD__ . ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
+       public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true, &$error = '' ) {
+               return $this->mPage->doDeleteArticle( $reason, $suppress, $id, $commit, $error );
+       }
 
-               if ( $wgUser->getStubThreshold() ) {
-                       wfIncrStats( 'pcache_miss_stub' );
-               }
+       public function doRollback( $fromP, $summary, $token, $bot, &$resultDetails, User $user = null ) {
+               global $wgUser;
+               $user = is_null( $user ) ? $wgUser : $user;
+               return $this->mPage->doRollback( $fromP, $summary, $token, $bot, $resultDetails, $user );
+       }
 
-               if ( $useParserCache ) {
-                       $parserOutput = ParserCache::singleton()->get( $this, $this->getParserOptions() );
-                       if ( $parserOutput !== false ) {
-                               return $parserOutput;
-                       }
-               }
+       public function commitRollback( $fromP, $summary, $bot, &$resultDetails, User $guser = null ) {
+               global $wgUser;
+               $guser = is_null( $guser ) ? $wgUser : $guser;
+               return $this->mPage->commitRollback( $fromP, $summary, $bot, $resultDetails, $guser );
+       }
 
-               // Cache miss; parse and output it.
-               if ( $oldid === null ) {
-                       $text = $this->getRawText();
-               } else {
-                       $rev = Revision::newFromTitle( $this->getTitle(), $oldid );
-                       if ( $rev === null ) {
-                               return false;
-                       }
-                       $text = $rev->getText();
-               }
+       public function generateReason( &$hasHistory ) {
+               return $this->mPage->getAutoDeleteReason( $hasHistory );
+       }
 
-               return $this->getOutputFromWikitext( $text, $useParserCache );
+       // ****** B/C functions for static methods ( __callStatic is PHP>=5.3 ) ****** //
+       public static function selectFields() {
+               return WikiPage::selectFields();
        }
 
-       /**
-        * Sets the context this Article is executed in
-        *
-        * @param $context RequestContext
-        * @since 1.18
-        */
-       public function setContext( $context ) {
-               $this->mContext = $context;
+       public static function onArticleCreate( $title ) {
+               return WikiPage::onArticleCreate( $title );
        }
 
-       /**
-        * Gets the context this Article is executed in
-        *
-        * @return RequestContext
-        * @since 1.18
-        */
-       public function getContext() {
-               if ( $this->mContext instanceof RequestContext ) {
-                       return $this->mContext;
-               } else {
-                       wfDebug( __METHOD__ . " called and \$mContext is null. Return RequestContext::getMain(); for sanity\n" );
-                       return RequestContext::getMain();
-               }
+       public static function onArticleDelete( $title ) {
+               return WikiPage::onArticleDelete( $title );
+       }
+
+       public static function onArticleEdit( $title ) {
+               return WikiPage::onArticleEdit( $title );
        }
 
+       public static function getAutosummary( $oldtext, $newtext, $flags ) {
+               return WikiPage::getAutosummary( $oldtext, $newtext, $flags );
+       }
+       // ******
 }
 
 class PoolWorkArticleView extends PoolCounterWork {
+
+       /**
+        * @var Article
+        */
        private $mArticle;
 
        function __construct( $article, $key, $useParserCache, $parserOptions ) {
@@ -4575,6 +2014,9 @@ class PoolWorkArticleView extends PoolCounterWork {
                return $this->mArticle->tryDirtyCache();
        }
 
+       /**
+        * @param $status Status
+        */
        function error( $status ) {
                global $wgOut;