* Use local context to get messages
[lhc/web/wiklou.git] / includes / WikiPage.php
index 9b7a02c..6cad466 100644 (file)
@@ -13,6 +13,30 @@ abstract class Page {}
  * @internal documentation reviewed 15 Mar 2010
  */
 class WikiPage extends Page {
+       // doDeleteArticleReal() return values. Values less than zero indicate fatal errors,
+       // values greater than zero indicate that there were problems not resulting in page
+       // not being deleted
+
+       /**
+        * Delete operation aborted by hook
+        */
+       const DELETE_HOOK_ABORTED = -1;
+
+       /**
+        * Deletion successful
+        */
+       const DELETE_SUCCESS = 0;
+
+       /**
+        * Page not found
+        */
+       const DELETE_NO_PAGE = 1;
+
+       /**
+        * No revisions found to delete
+        */
+       const DELETE_NO_REVISIONS = 2;
+
        /**
         * @var Title
         */
@@ -21,11 +45,11 @@ class WikiPage extends Page {
        /**@{{
         * @protected
         */
-       public $mCounter = -1;               // !< Integer (-1 means "not loaded")
        public $mDataLoaded = false;         // !< Boolean
        public $mIsRedirect = false;         // !< Boolean
        public $mLatest = false;             // !< Integer (false means "not loaded")
-       public $mPreparedEdit = false;           // !< Array
+       public $mPreparedEdit = false;       // !< Array
+       /**@}}*/
 
        /**
         * @var Title
@@ -37,9 +61,20 @@ class WikiPage extends Page {
         */
        protected $mLastRevision = null;
 
-       protected $mTimestamp = '';             // !< String
-       protected $mTouched = '19700101000000'; // !< String
-       /**@}}*/
+       /**
+        * @var string; timestamp of the current revision or empty string if not loaded
+        */
+       protected $mTimestamp = '';
+
+       /**
+        * @var string
+        */
+       protected $mTouched = '19700101000000';
+
+       /**
+        * @var int|null
+        */
+       protected $mCounter = null;
 
        /**
         * Constructor and clear the article
@@ -83,7 +118,7 @@ class WikiPage extends Page {
         *
         * @param $id Int article ID to load
         *
-        * @return WikiPage
+        * @return WikiPage|null
         */
        public static function newFromID( $id ) {
                $t = Title::newFromID( $id );
@@ -107,125 +142,6 @@ class WikiPage extends Page {
                return array();
        }
 
-       /**
-        * If this page is a redirect, get its target
-        *
-        * The target will be fetched from the redirect table if possible.
-        * If this page doesn't have an entry there, call insertRedirect()
-        * @return Title|mixed object, or null if this page is not a redirect
-        */
-       public function getRedirectTarget() {
-               if ( !$this->mTitle->isRedirect() ) {
-                       return null;
-               }
-
-               if ( $this->mRedirectTarget !== null ) {
-                       return $this->mRedirectTarget;
-               }
-
-               # Query the redirect table
-               $dbr = wfGetDB( DB_SLAVE );
-               $row = $dbr->selectRow( 'redirect',
-                       array( 'rd_namespace', 'rd_title', 'rd_fragment', 'rd_interwiki' ),
-                       array( 'rd_from' => $this->getId() ),
-                       __METHOD__
-               );
-
-               // rd_fragment and rd_interwiki were added later, populate them if empty
-               if ( $row && !is_null( $row->rd_fragment ) && !is_null( $row->rd_interwiki ) ) {
-                       return $this->mRedirectTarget = Title::makeTitle(
-                               $row->rd_namespace, $row->rd_title,
-                               $row->rd_fragment, $row->rd_interwiki );
-               }
-
-               # This page doesn't have an entry in the redirect table
-               return $this->mRedirectTarget = $this->insertRedirect();
-       }
-
-       /**
-        * Insert an entry for this page into the redirect table.
-        *
-        * Don't call this function directly unless you know what you're doing.
-        * @return Title object or null if not a redirect
-        */
-       public function insertRedirect() {
-               // recurse through to only get the final target
-               $retval = Title::newFromRedirectRecurse( $this->getRawText() );
-               if ( !$retval ) {
-                       return null;
-               }
-               $this->insertRedirectEntry( $retval );
-               return $retval;
-       }
-
-       /**
-        * Insert or update the redirect table entry for this page to indicate
-        * it redirects to $rt .
-        * @param $rt Title redirect target
-        */
-       public function insertRedirectEntry( $rt ) {
-               $dbw = wfGetDB( DB_MASTER );
-               $dbw->replace( 'redirect', array( 'rd_from' ),
-                       array(
-                               'rd_from'      => $this->getId(),
-                               'rd_namespace' => $rt->getNamespace(),
-                               'rd_title'     => $rt->getDBkey(),
-                               'rd_fragment'  => $rt->getFragment(),
-                               'rd_interwiki' => $rt->getInterwiki(),
-                       ),
-                       __METHOD__
-               );
-       }
-
-       /**
-        * Get the Title object or URL this page redirects to
-        *
-        * @return mixed false, Title of in-wiki target, or string with URL
-        */
-       public function followRedirect() {
-               return $this->getRedirectURL( $this->getRedirectTarget() );
-       }
-
-       /**
-        * Get the Title object or URL to use for a redirect. We use Title
-        * objects for same-wiki, non-special redirects and URLs for everything
-        * else.
-        * @param $rt Title Redirect target
-        * @return mixed false, Title object of local target, or string with URL
-        */
-       public function getRedirectURL( $rt ) {
-               if ( $rt ) {
-                       if ( $rt->getInterwiki() != '' ) {
-                               if ( $rt->isLocal() ) {
-                                       // Offsite wikis need an HTTP redirect.
-                                       //
-                                       // This can be hard to reverse and may produce loops,
-                                       // so they may be disabled in the site configuration.
-                                       $source = $this->mTitle->getFullURL( 'redirect=no' );
-                                       return $rt->getFullURL( 'rdfrom=' . urlencode( $source ) );
-                               }
-                       } else {
-                               if ( $rt->isSpecialPage() ) {
-                                       // 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;
-       }
-
        /**
         * Get the title object of the article
         * @return Title object of this page
@@ -240,46 +156,16 @@ class WikiPage extends Page {
        public function clear() {
                $this->mDataLoaded = false;
 
-               $this->mCounter = -1; # Not loaded
+               $this->mCounter = null;
                $this->mRedirectTarget = null; # Title object if set
                $this->mLastRevision = null; # Latest revision
-               $this->mTimestamp = '';
                $this->mTouched = '19700101000000';
+               $this->mTimestamp = '';
                $this->mIsRedirect = false;
                $this->mLatest = false;
                $this->mPreparedEdit = false;
        }
 
-       /**
-        * 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 ) {
-               $cur_text = $this->getRawText();
-               if ( $cur_text === false ) {
-                       return false; // no page
-               }
-               $undo_text = $undo->getText();
-               $undoafter_text = $undoafter->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 the list of revision fields that should be selected to create
         * a new page.
@@ -404,7 +290,7 @@ class WikiPage extends Page {
         * @return bool Whether or not the page exists in the database
         */
        public function exists() {
-               return $this->getId() > 0;
+               return $this->mTitle->exists();
        }
 
        /**
@@ -416,74 +302,20 @@ class WikiPage extends Page {
         * @return bool
         */
        public function hasViewableContent() {
-               return $this->exists() || $this->mTitle->isAlwaysKnown();
+               return $this->mTitle->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__
-                               );
-                       }
+               if ( !$this->mDataLoaded ) {
+                       $this->loadPageData();
                }
 
                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 $editInfo Object or false: object returned by prepareTextForEdit(),
-        *        if false, the current database state will be used
-        * @return Boolean
-        */
-       public function isCountable( $editInfo = false ) {
-               global $wgArticleCountMethod;
-
-               if ( !$this->mTitle->isContentPage() ) {
-                       return false;
-               }
-
-               $text = $editInfo ? $editInfo->pst : false;
-
-               if ( $this->isRedirect( $text ) ) {
-                       return false;
-               }
-
-               switch ( $wgArticleCountMethod ) {
-               case 'any':
-                       return true;
-               case 'comma':
-                       if ( $text === false ) {
-                               $text = $this->getRawText();
-                       }
-                       return strpos( $text,  ',' ) !== false;
-               case 'link':
-                       if ( $editInfo ) {
-                               // ParserOutput::getLinks() is a 2D array of page links, so
-                               // to be really correct we would need to recurse in the array
-                               // but the main array should only have items in it if there are
-                               // links.
-                               return (bool)count( $editInfo->output->getLinks() );
-                       } else {
-                               return (bool)wfGetDB( DB_SLAVE )->selectField( 'pagelinks', 1,
-                                       array( 'pl_from' => $this->getId() ), __METHOD__ );
-                       }
-               }
-       }
-
        /**
         * Tests if the article text represents a redirect
         *
@@ -502,6 +334,39 @@ class WikiPage extends Page {
                }
        }
 
+       /**
+        * 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;
+       }
+
        /**
         * Loads everything except the text
         * This isn't necessary for all uses, so it's only done if needed.
@@ -549,7 +414,7 @@ class WikiPage extends Page {
         *      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|false The text of the current revision
+        * @return String|bool The text of the current revision. False on failure
         */
        public function getText( $audience = Revision::FOR_PUBLIC ) {
                $this->loadLastEdit();
@@ -562,7 +427,7 @@ class WikiPage extends Page {
        /**
         * Get the text of the current revision. No side-effects...
         *
-        * @return String|false The text of the current revision
+        * @return String|bool The text of the current revision. False on failure
         */
        public function getRawText() {
                $this->loadLastEdit();
@@ -580,6 +445,7 @@ class WikiPage extends Page {
                if ( !$this->mTimestamp ) {
                        $this->loadLastEdit();
                }
+               
                return wfTimestamp( TS_MW, $this->mTimestamp );
        }
 
@@ -655,20 +521,208 @@ class WikiPage extends Page {
        }
 
        /**
-        * 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 UserArrayFromResult
+        * Get the cached timestamp for the last time the page changed.
+        * This is only used to help handle slave lag by comparing to page_touched.
+        * @return string MW timestamp
         */
-       public function getContributors() {
-               # @todo FIXME: This is expensive; cache this info somewhere.
-
-               $dbr = wfGetDB( DB_SLAVE );
+       protected function getCachedLastEditTime() {
+               global $wgMemc;
+               $key = wfMemcKey( 'page-lastedit', md5( $this->mTitle->getPrefixedDBkey() ) );
+               return $wgMemc->get( $key );
+       }
 
-               if ( $dbr->implicitGroupby() ) {
-                       $realNameField = 'user_real_name';
-               } else {
-                       $realNameField = 'MIN(user_real_name) AS user_real_name';
-               }
+       /**
+        * Set the cached timestamp for the last time the page changed.
+        * This is only used to help handle slave lag by comparing to page_touched.
+        * @param $timestamp string
+        * @return void
+        */
+       public function setCachedLastEditTime( $timestamp ) {
+               global $wgMemc;
+               $key = wfMemcKey( 'page-lastedit', md5( $this->mTitle->getPrefixedDBkey() ) );
+               $wgMemc->set( $key, wfTimestamp( TS_MW, $timestamp ), 60*15 );
+       }
+
+       /**
+        * 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 $editInfo Object or false: object returned by prepareTextForEdit(),
+        *        if false, the current database state will be used
+        * @return Boolean
+        */
+       public function isCountable( $editInfo = false ) {
+               global $wgArticleCountMethod;
+
+               if ( !$this->mTitle->isContentPage() ) {
+                       return false;
+               }
+
+               $text = $editInfo ? $editInfo->pst : false;
+
+               if ( $this->isRedirect( $text ) ) {
+                       return false;
+               }
+
+               switch ( $wgArticleCountMethod ) {
+               case 'any':
+                       return true;
+               case 'comma':
+                       if ( $text === false ) {
+                               $text = $this->getRawText();
+                       }
+                       return strpos( $text,  ',' ) !== false;
+               case 'link':
+                       if ( $editInfo ) {
+                               // ParserOutput::getLinks() is a 2D array of page links, so
+                               // to be really correct we would need to recurse in the array
+                               // but the main array should only have items in it if there are
+                               // links.
+                               return (bool)count( $editInfo->output->getLinks() );
+                       } else {
+                               return (bool)wfGetDB( DB_SLAVE )->selectField( 'pagelinks', 1,
+                                       array( 'pl_from' => $this->getId() ), __METHOD__ );
+                       }
+               }
+       }
+
+       /**
+        * If this page is a redirect, get its target
+        *
+        * The target will be fetched from the redirect table if possible.
+        * If this page doesn't have an entry there, call insertRedirect()
+        * @return Title|mixed object, or null if this page is not a redirect
+        */
+       public function getRedirectTarget() {
+               if ( !$this->mTitle->isRedirect() ) {
+                       return null;
+               }
+
+               if ( $this->mRedirectTarget !== null ) {
+                       return $this->mRedirectTarget;
+               }
+
+               # Query the redirect table
+               $dbr = wfGetDB( DB_SLAVE );
+               $row = $dbr->selectRow( 'redirect',
+                       array( 'rd_namespace', 'rd_title', 'rd_fragment', 'rd_interwiki' ),
+                       array( 'rd_from' => $this->getId() ),
+                       __METHOD__
+               );
+
+               // rd_fragment and rd_interwiki were added later, populate them if empty
+               if ( $row && !is_null( $row->rd_fragment ) && !is_null( $row->rd_interwiki ) ) {
+                       return $this->mRedirectTarget = Title::makeTitle(
+                               $row->rd_namespace, $row->rd_title,
+                               $row->rd_fragment, $row->rd_interwiki );
+               }
+
+               # This page doesn't have an entry in the redirect table
+               return $this->mRedirectTarget = $this->insertRedirect();
+       }
+
+       /**
+        * Insert an entry for this page into the redirect table.
+        *
+        * Don't call this function directly unless you know what you're doing.
+        * @return Title object or null if not a redirect
+        */
+       public function insertRedirect() {
+               // recurse through to only get the final target
+               $retval = Title::newFromRedirectRecurse( $this->getRawText() );
+               if ( !$retval ) {
+                       return null;
+               }
+               $this->insertRedirectEntry( $retval );
+               return $retval;
+       }
+
+       /**
+        * Insert or update the redirect table entry for this page to indicate
+        * it redirects to $rt .
+        * @param $rt Title redirect target
+        */
+       public function insertRedirectEntry( $rt ) {
+               $dbw = wfGetDB( DB_MASTER );
+               $dbw->replace( 'redirect', array( 'rd_from' ),
+                       array(
+                               'rd_from'      => $this->getId(),
+                               'rd_namespace' => $rt->getNamespace(),
+                               'rd_title'     => $rt->getDBkey(),
+                               'rd_fragment'  => $rt->getFragment(),
+                               'rd_interwiki' => $rt->getInterwiki(),
+                       ),
+                       __METHOD__
+               );
+       }
+
+       /**
+        * Get the Title object or URL this page redirects to
+        *
+        * @return mixed false, Title of in-wiki target, or string with URL
+        */
+       public function followRedirect() {
+               return $this->getRedirectURL( $this->getRedirectTarget() );
+       }
+
+       /**
+        * Get the Title object or URL to use for a redirect. We use Title
+        * objects for same-wiki, non-special redirects and URLs for everything
+        * else.
+        * @param $rt Title Redirect target
+        * @return mixed false, Title object of local target, or string with URL
+        */
+       public function getRedirectURL( $rt ) {
+               if ( !$rt ) {
+                       return false;
+               }
+
+               if ( $rt->isExternal() ) {
+                       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 {
+                               // External pages pages without "local" bit set are not valid
+                               // redirect targets
+                               return false;
+                       }
+               }
+
+               if ( $rt->isSpecialPage() ) {
+                       // Gotta handle redirects to special pages differently:
+                       // Fill the HTTP response "Location" header and ignore
+                       // the rest of the page we're on.
+                       //
+                       // Some pages are not valid targets
+                       if ( $rt->isValidRedirectTarget() ) {
+                               return $rt->getFullURL();
+                       } else {
+                               return false;
+                       }
+               }
+
+               return $rt;
+       }
+
+       /**
+        * 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 UserArrayFromResult
+        */
+       public function getContributors() {
+               # @todo FIXME: This is expensive; cache this info somewhere.
+
+               $dbr = wfGetDB( DB_SLAVE );
+
+               if ( $dbr->implicitGroupby() ) {
+                       $realNameField = 'user_real_name';
+               } else {
+                       $realNameField = 'MIN(user_real_name) AS user_real_name';
+               }
 
                $tables = array( 'revision', 'user' );
 
@@ -705,25 +759,137 @@ class WikiPage extends Page {
                return new UserArrayFromResult( $res );
        }
 
+       /**
+        * 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;
+       }
+
        /**
         * Should the parser cache be used?
         *
-        * @param $user User The relevant user
+        * @param $parserOptions ParserOptions to check
         * @param $oldid int
         * @return boolean
         */
-       public function isParserCacheUsed( User $user, $oldid ) {
+       public function isParserCacheUsed( ParserOptions $parserOptions, $oldid ) {
                global $wgEnableParserCache;
 
                return $wgEnableParserCache
-                       && $user->getStubThreshold() == 0
-                       && $this->exists()
+                       && $parserOptions->getStubThreshold() == 0
+                       && $this->mTitle->exists()
                        && ( $oldid === null || $oldid === 0 || $oldid === $this->getLatest() )
                        && $this->mTitle->isWikitextPage();
        }
 
+       /**
+        * Get a ParserOutput for the given ParserOptions and revision ID.
+        * The parser cache will be used if possible.
+        *
+        * @since 1.19
+        * @param $parserOptions ParserOptions to use for the parse operation
+        * @param $oldid Revision ID to get the text from, passing null or 0 will
+        *               get the current revision (default value)
+        * @return ParserOutput or false if the revision was not found
+        */
+       public function getParserOutput( ParserOptions $parserOptions, $oldid = null ) {
+               wfProfileIn( __METHOD__ );
+
+               $useParserCache = $this->isParserCacheUsed( $parserOptions, $oldid );
+               wfDebug( __METHOD__ . ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
+               if ( $parserOptions->getStubThreshold() ) {
+                       wfIncrStats( 'pcache_miss_stub' );
+               }
+
+               if ( $useParserCache ) {
+                       $parserOutput = ParserCache::singleton()->get( $this, $parserOptions );
+                       if ( $parserOutput !== false ) {
+                               wfProfileOut( __METHOD__ );
+                               return $parserOutput;
+                       }
+               }
+
+               if ( $oldid === null || $oldid === 0 ) {
+                       $oldid = $this->getLatest();
+               }
+
+               $pool = new PoolWorkArticleView( $this, $parserOptions, $oldid, $useParserCache );
+               $pool->execute();
+
+               wfProfileOut( __METHOD__ );
+
+               return $pool->getParserOutput();
+       }
+
+       /**
+        * Do standard deferred updates after page view
+        * @param $user User The relevant user
+        */
+       public function doViewUpdates( User $user ) {
+               global $wgDisableCounters;
+               if ( wfReadOnly() ) {
+                       return;
+               }
+
+               # Don't update page view counters on views from bot users (bug 14044)
+               if ( !$wgDisableCounters && !$user->isAllowed( 'bot' ) && $this->mTitle->exists() ) {
+                       DeferredUpdates::addUpdate( new ViewCountUpdate( $this->getId() ) );
+                       DeferredUpdates::addUpdate( new SiteStatsUpdate( 1, 0, 0 ) );
+               }
+
+               # Update newtalk / watchlist notification status
+               $user->clearNotification( $this->mTitle );
+       }
+
        /**
         * Perform the actions of a page purging
+        * @return bool
         */
        public function doPurge() {
                global $wgUseSquid;
@@ -739,7 +905,7 @@ class WikiPage extends Page {
                if ( $wgUseSquid ) {
                        // Commit the transaction before the purge is sent
                        $dbw = wfGetDB( DB_MASTER );
-                       $dbw->commit();
+                       $dbw->commit( __METHOD__ );
 
                        // Send purge
                        $update = SquidUpdate::newSimplePurge( $this->mTitle );
@@ -747,14 +913,15 @@ class WikiPage extends Page {
                }
 
                if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                       if ( $this->getId() == 0 ) {
-                               $text = false;
-                       } else {
+                       if ( $this->mTitle->exists() ) {
                                $text = $this->getRawText();
+                       } else {
+                               $text = false;
                        }
 
                        MessageCache::singleton()->replace( $this->mTitle->getDBkey(), $text );
                }
+               return true;
        }
 
        /**
@@ -815,6 +982,7 @@ class WikiPage extends Page {
                wfProfileIn( __METHOD__ );
 
                $text = $revision->getText();
+               $len = strlen( $text );
                $rt = Title::newFromRedirectRecurse( $text );
 
                $conditions = array( 'page_id' => $this->getId() );
@@ -831,7 +999,7 @@ class WikiPage extends Page {
                                'page_touched'     => $dbw->timestamp( $now ),
                                'page_is_new'      => ( $lastRevision === 0 ) ? 1 : 0,
                                'page_is_redirect' => $rt !== null ? 1 : 0,
-                               'page_len'         => strlen( $text ),
+                               'page_len'         => $len,
                        ),
                        $conditions,
                        __METHOD__ );
@@ -839,43 +1007,25 @@ class WikiPage extends Page {
                $result = $dbw->affectedRows() != 0;
                if ( $result ) {
                        $this->updateRedirectOn( $dbw, $rt, $lastRevIsRedirect );
+                       $this->setLastEdit( $revision );
                        $this->setCachedLastEditTime( $now );
+                       $this->mLatest = $revision->getId();
+                       $this->mIsRedirect = (bool)$rt;
+                       # Update the LinkCache.
+                       LinkCache::singleton()->addGoodLinkObj( $this->getId(), $this->mTitle, $len, $this->mIsRedirect, $this->mLatest );
                }
 
                wfProfileOut( __METHOD__ );
                return $result;
        }
 
-       /**
-        * Get the cached timestamp for the last time the page changed.
-        * This is only used to help handle slave lag by comparing to page_touched.
-        * @return string MW timestamp
-        */
-       protected function getCachedLastEditTime() {
-               global $wgMemc;
-               $key = wfMemcKey( 'page-lastedit', md5( $this->mTitle->getPrefixedDBkey() ) );
-               return $wgMemc->get( $key );
-       }
-
-       /**
-        * Set the cached timestamp for the last time the page changed.
-        * This is only used to help handle slave lag by comparing to page_touched.
-        * @param $timestamp string
-        * @return void
-        */
-       public function setCachedLastEditTime( $timestamp ) {
-               global $wgMemc;
-               $key = wfMemcKey( 'page-lastedit', md5( $this->mTitle->getPrefixedDBkey() ) );
-               $wgMemc->set( $key, wfTimestamp( TS_MW, $timestamp ), 60*15 );
-       }
-
        /**
         * Add row to the redirect table if this is a redirect, remove otherwise.
         *
         * @param $dbw DatabaseBase
         * @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
+        * @param $lastRevIsRedirect null|bool If given, will optimize adding and
         *                           removing rows in redirect table.
         * @return bool true on success, false on failure
         * @private
@@ -886,7 +1036,7 @@ class WikiPage extends Page {
                // Delete if changing from redirect to non-redirect
                $isRedirect = !is_null( $redirectTitle );
 
-               if ( !$isRedirect && !is_null( $lastRevIsRedirect ) && $lastRevIsRedirect === $isRedirect ) {
+               if ( !$isRedirect && $lastRevIsRedirect === false ) {
                        return true;
                }
 
@@ -911,7 +1061,7 @@ class WikiPage extends Page {
         * If the given revision is newer than the currently set page_latest,
         * update the page record. Otherwise, do nothing.
         *
-        * @param $dbw Database object
+        * @param $dbw DatabaseBase object
         * @param $revision Revision object
         * @return mixed
         */
@@ -946,37 +1096,73 @@ class WikiPage extends Page {
        }
 
        /**
-        * @param $section empty/null/false or a section number (0, 1, 2, T1, T2...)
+        * 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 ) {
+               $cur_text = $this->getRawText();
+               if ( $cur_text === false ) {
+                       return false; // no page
+               }
+               $undo_text = $undo->getText();
+               $undoafter_text = $undoafter->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;
+       }
+
+       /**
+        * @param $section null|bool|int 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 $sectionTitle 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
         */
-       public function replaceSection( $section, $text, $summary = '', $edittime = null ) {
+       public function replaceSection( $section, $text, $sectionTitle = '', $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 );
+                       // Bug 30711: always use current version when adding a new section
+                       if ( is_null( $edittime ) || $section == 'new' ) {
+                               $oldtext = $this->getRawText();
+                               if ( $oldtext === false ) {
+                                       wfDebug( __METHOD__ . ": no page text\n" );
+                                       wfProfileOut( __METHOD__ );
+                                       return null;
+                               }
                        } else {
                                $dbw = wfGetDB( DB_MASTER );
                                $rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
-                       }
 
-                       if ( !$rev ) {
-                               wfDebug( "WikiPage::replaceSection asked for bogus section (page: " .
-                                       $this->getId() . "; section: $section; edittime: $edittime)\n" );
-                               wfProfileOut( __METHOD__ );
-                               return null;
-                       }
+                               if ( !$rev ) {
+                                       wfDebug( "WikiPage::replaceSection asked for bogus section (page: " .
+                                               $this->getId() . "; section: $section; edittime: $edittime)\n" );
+                                       wfProfileOut( __METHOD__ );
+                                       return null;
+                               }
 
-                       $oldtext = $rev->getText();
+                               $oldtext = $rev->getText();
+                       }
 
                        if ( $section == 'new' ) {
                                # Inserting a new section
-                               $subject = $summary ? wfMsgForContent( 'newsectionheaderdefaultlevel', $summary ) . "\n\n" : '';
+                               $subject = $sectionTitle ? wfMsgForContent( 'newsectionheaderdefaultlevel', $sectionTitle ) . "\n\n" : '';
                                if ( wfRunHooks( 'PlaceNewSection', array( $this, $oldtext, $subject, &$text ) ) ) {
                                        $text = strlen( trim( $oldtext ) ) > 0
                                                ? "{$oldtext}\n\n{$subject}{$text}"
@@ -1039,7 +1225,7 @@ class WikiPage extends Page {
         * 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 $baseRevId int the revision ID this edit was based off, if any
         * @param $user User the user doing the edit
         *
         * @return Status object. Possible errors:
@@ -1094,6 +1280,8 @@ class WikiPage extends Page {
 
                $oldtext = $this->getRawText(); // current revision
                $oldsize = strlen( $oldtext );
+               $oldid = $this->getLatest();
+               $oldIsRedirect = $this->isRedirect();
                $oldcountable = $this->isCountable();
 
                # Provide autosummaries if one is not provided and autosummaries are enabled.
@@ -1113,6 +1301,15 @@ class WikiPage extends Page {
                        # Update article, but only if changed.
                        $status->value['new'] = false;
 
+                       if ( !$oldid ) {
+                               # Article gone missing
+                               wfDebug( __METHOD__ . ": EDIT_UPDATE specified but article doesn't exist\n" );
+                               $status->fatal( 'edit-gone-missing' );
+
+                               wfProfileOut( __METHOD__ );
+                               return $status;
+                       }
+
                        # Make sure the revision is either completely inserted or not inserted at all
                        if ( !$wgDBtransactions ) {
                                $userAbort = ignore_user_abort( true );
@@ -1123,7 +1320,7 @@ class WikiPage extends Page {
                                'comment'    => $summary,
                                'minor_edit' => $isminor,
                                'text'       => $text,
-                               'parent_id'  => $this->mLatest,
+                               'parent_id'  => $oldid,
                                'user'       => $user->getId(),
                                'user_text'  => $user->getName(),
                                'timestamp'  => $now
@@ -1132,16 +1329,7 @@ class WikiPage extends Page {
                        $changed = ( strcmp( $text, $oldtext ) != 0 );
 
                        if ( $changed ) {
-                               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;
-                               }
-
-                               $dbw->begin();
+                               $dbw->begin( __METHOD__ );
                                $revisionId = $revision->insertOn( $dbw );
 
                                # Update page
@@ -1151,7 +1339,7 @@ class WikiPage extends Page {
                                # 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 );
+                               $ok = $this->updateRevisionOn( $dbw, $revision, $oldid, $oldIsRedirect );
 
                                if ( !$ok ) {
                                        /* Belated edit conflict! Run away!! */
@@ -1163,7 +1351,7 @@ class WikiPage extends Page {
                                        }
 
                                        $revisionId = 0;
-                                       $dbw->rollback();
+                                       $dbw->rollback( __METHOD__ );
                                } else {
                                        global $wgUseRCPatrol;
                                        wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, $baseRevId, $user ) );
@@ -1174,18 +1362,22 @@ class WikiPage extends Page {
                                                        $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,
+                                                       $oldid, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
                                                        $revisionId, $patrolled
                                                );
 
                                                # Log auto-patrolled edits
                                                if ( $patrolled ) {
-                                                       PatrolLog::record( $rc, true );
+                                                       PatrolLog::record( $rc, true, $user );
                                                }
                                        }
                                        $user->incEditCount();
-                                       $dbw->commit();
+                                       $dbw->commit( __METHOD__ );
                                }
+                       } else {
+                               // Bug 32948: revision ID must be set to page {{REVISIONID}} and
+                               // related variables correctly
+                               $revision->setId( $this->getLatest() );
                        }
 
                        if ( !$wgDBtransactions ) {
@@ -1205,8 +1397,6 @@ class WikiPage extends Page {
                        if ( !$changed ) {
                                $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();
@@ -1215,14 +1405,14 @@ class WikiPage extends Page {
                        # Create new article
                        $status->value['new'] = true;
 
-                       $dbw->begin();
+                       $dbw->begin( __METHOD__ );
 
                        # 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();
+                               $dbw->rollback( __METHOD__ );
                                $status->fatal( 'edit-already-exists' );
 
                                wfProfileOut( __METHOD__ );
@@ -1241,11 +1431,6 @@ class WikiPage extends Page {
                        ) );
                        $revisionId = $revision->insertOn( $dbw );
 
-                       $this->mTitle->resetArticleID( $newid );
-                       # Update the LinkCache. Resetting the Title ArticleID means it will rely on having that already cached
-                       # @todo 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 );
 
@@ -1264,41 +1449,243 @@ class WikiPage extends Page {
 
                                # Log auto-patrolled edits
                                if ( $patrolled ) {
-                                       PatrolLog::record( $rc, true );
+                                       PatrolLog::record( $rc, true, $user );
+                               }
+                       }
+                       $user->incEditCount();
+                       $dbw->commit( __METHOD__ );
+
+                       # Update links, etc.
+                       $this->doEditUpdates( $revision, $user, array( 'created' => true ) );
+
+                       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 ) ) {
+                       DeferredUpdates::doUpdates();
+               }
+
+               // Return the new revision (or null) to the caller
+               $status->value['revision'] = $revision;
+
+               wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $text, $summary,
+                       $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ) );
+
+               # Promote user to any groups they meet the criteria for
+               $user->addAutopromoteOnceGroups( 'onEdit' );
+
+               wfProfileOut( __METHOD__ );
+               return $status;
+       }
+
+       /**
+        * Get parser options suitable for rendering the primary article wikitext
+        * @param User|string $user User object or 'canonical'
+        * @return ParserOptions
+        */
+       public function makeParserOptions( $user ) {
+               global $wgContLang;
+               if ( $user instanceof User ) { // settings per user (even anons)
+                       $options = ParserOptions::newFromUser( $user );
+               } else { // canonical settings
+                       $options = ParserOptions::newFromUserAndLang( new User, $wgContLang );
+               }
+               $options->enableLimitReport(); // show inclusion/loop reports
+               $options->setTidy( true ); // fix bad HTML
+               return $options;
+       }
+
+       /**
+        * Prepare text which is about to be saved.
+        * Returns a stdclass with source, pst and output members
+        * @return bool|object
+        */
+       public function prepareTextForEdit( $text, $revid = null, User $user = null ) {
+               global $wgParser, $wgContLang, $wgUser;
+               $user = is_null( $user ) ? $wgUser : $user;
+               // @TODO fixme: check $user->getId() here???
+               if ( $this->mPreparedEdit
+                       && $this->mPreparedEdit->newText == $text
+                       && $this->mPreparedEdit->revid == $revid
+               ) {
+                       // Already prepared
+                       return $this->mPreparedEdit;
+               }
+
+               $popts = ParserOptions::newFromUserAndLang( $user, $wgContLang );
+               wfRunHooks( 'ArticlePrepareTextForEdit', array( $this, $popts ) );
+
+               $edit = (object)array();
+               $edit->revid = $revid;
+               $edit->newText = $text;
+               $edit->pst = $wgParser->preSaveTransform( $text, $this->mTitle, $user, $popts );
+               $edit->popts = $this->makeParserOptions( 'canonical' );
+               $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $edit->popts, true, true, $revid );
+               $edit->oldText = $this->getRawText();
+
+               $this->mPreparedEdit = $edit;
+
+               return $edit;
+       }
+
+       /**
+        * Do standard deferred updates after page edit.
+        * Update links tables, site stats, search index and message cache.
+        * Purges pages that include this page if the text was changed here.
+        * Every 100th edit, prune the recent changes table.
+        *
+        * @private
+        * @param $revision Revision object
+        * @param $user User object that did the revision
+        * @param $options Array of options, following indexes are used:
+        * - changed: boolean, whether the revision changed the content (default true)
+        * - created: boolean, whether the revision created the page (default false)
+        * - oldcountable: boolean or null (default null):
+        *   - boolean: whether the page was counted as an article before that
+        *     revision, only used in changed is true and created is false
+        *   - null: don't change the article count
+        */
+       public function doEditUpdates( Revision $revision, User $user, array $options = array() ) {
+               global $wgEnableParserCache;
+
+               wfProfileIn( __METHOD__ );
+
+               $options += array( 'changed' => true, 'created' => false, 'oldcountable' => null );
+               $text = $revision->getText();
+
+               # 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, $revision->getId(), $user );
+               } else {
+                       wfDebug( __METHOD__ . ": No vary-revision, using prepared edit...\n" );
+                       $editInfo = $this->mPreparedEdit;
+               }
+
+               # Save it to the parser cache
+               if ( $wgEnableParserCache ) {
+                       $parserCache = ParserCache::singleton();
+                       $parserCache->save( $editInfo->output, $this, $editInfo->popts );
+               }
+
+               # Update the links tables
+               $u = new LinksUpdate( $this->mTitle, $editInfo->output );
+               $u->doUpdate();
+
+               wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $options['changed'] ) );
+
+               if ( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
+                       if ( 0 == mt_rand( 0, 99 ) ) {
+                               // Flush old entries from the `recentchanges` table; we do this on
+                               // random requests so as to avoid an increase in writes for no good reason
+                               global $wgRCMaxAge;
+
+                               $dbw = wfGetDB( DB_MASTER );
+                               $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
+                               $dbw->delete(
+                                       'recentchanges',
+                                       array( "rc_timestamp < '$cutoff'" ),
+                                       __METHOD__
+                               );
+                       }
+               }
+
+               if ( !$this->mTitle->exists() ) {
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
+
+               $id = $this->getId();
+               $title = $this->mTitle->getPrefixedDBkey();
+               $shortTitle = $this->mTitle->getDBkey();
+
+               if ( !$options['changed'] ) {
+                       $good = 0;
+                       $total = 0;
+               } elseif ( $options['created'] ) {
+                       $good = (int)$this->isCountable( $editInfo );
+                       $total = 1;
+               } elseif ( $options['oldcountable'] !== null ) {
+                       $good = (int)$this->isCountable( $editInfo ) - (int)$options['oldcountable'];
+                       $total = 0;
+               } else {
+                       $good = 0;
+                       $total = 0;
+               }
+
+               DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 1, $good, $total ) );
+               DeferredUpdates::addUpdate( new SearchUpdate( $id, $title, $text ) );
+
+               # If this is another user's talk page, update newtalk.
+               # Don't do this if $options['changed'] = false (null-edits) nor if
+               # it's a minor edit and the user doesn't want notifications for those.
+               if ( $options['changed']
+                       && $this->mTitle->getNamespace() == NS_USER_TALK
+                       && $shortTitle != $user->getTitleKey()
+                       && !( $revision->isMinor() && $user->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" );
                                }
                        }
-                       $user->incEditCount();
-                       $dbw->commit();
-
-                       # Update links, etc.
-                       $this->doEditUpdates( $revision, $user, array( 'created' => true ) );
+               }
 
-                       wfRunHooks( 'ArticleInsertComplete', array( &$this, &$user, $text, $summary,
-                               $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
+               if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+                       MessageCache::singleton()->replace( $shortTitle, $text );
                }
 
-               # Do updates right now unless deferral was requested
-               if ( !( $flags & EDIT_DEFER_UPDATES ) ) {
-                       DeferredUpdates::doUpdates();
+               if( $options['created'] ) {
+                       self::onArticleCreate( $this->mTitle );
+               } else {
+                       self::onArticleEdit( $this->mTitle );
                }
 
-               // Return the new revision (or null) to the caller
-               $status->value['revision'] = $revision;
+               wfProfileOut( __METHOD__ );
+       }
 
-               wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $text, $summary,
-                       $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ) );
+       /**
+        * 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 $user User The relevant user
+        * @param $comment String: comment submitted
+        * @param $minor Boolean: whereas it's a minor modification
+        */
+       public function doQuickEdit( $text, User $user, $comment = '', $minor = 0 ) {
+               wfProfileIn( __METHOD__ );
 
-               # Promote user to any groups they meet the criteria for
-               $user->addAutopromoteOnceGroups( 'onEdit' );
+               $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 );
+
+               wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $user ) );
 
                wfProfileOut( __METHOD__ );
-               return $status;
        }
 
        /**
         * Update the article's restriction field, and leave a log entry.
-        *
-        * @todo: seperate the business/permission stuff out from backend code
+        * This works for protection both existing and non-existing pages.
         *
         * @param $limit Array: set of restriction keys
         * @param $reason String
@@ -1307,30 +1694,16 @@ class WikiPage extends Page {
         * @param $user User The user updating the restrictions
         * @return bool true on success
         */
-       public function updateRestrictions(
-               $limit = array(), $reason = '', &$cascade = 0, $expiry = array(), User $user = null
-       ) {
-               global $wgUser, $wgContLang;
-               $user = is_null( $user ) ? $wgUser : $user;
-
-               $restrictionTypes = $this->mTitle->getRestrictionTypes();
-
-               $id = $this->mTitle->getArticleID();
-
-               if ( $id <= 0 ) {
-                       wfDebug( "updateRestrictions failed: article id $id <= 0\n" );
-                       return false;
-               }
+       public function doUpdateRestrictions( array $limit, array $expiry, &$cascade, $reason, User $user ) {
+               global $wgContLang;
 
                if ( wfReadOnly() ) {
-                       wfDebug( "updateRestrictions failed: read-only\n" );
-                       return false;
+                       return Status::newFatal( 'readonlytext', wfReadOnlyReason() );
                }
 
-               if ( count( $this->mTitle->getUserPermissionsErrors( 'protect', $user ) ) ) {
-                       wfDebug( "updateRestrictions failed: insufficient permissions\n" );
-                       return false;
-               }
+               $restrictionTypes = $this->mTitle->getRestrictionTypes();
+
+               $id = $this->mTitle->getArticleID();
 
                if ( !$cascade ) {
                        $cascade = false;
@@ -1341,151 +1714,182 @@ class WikiPage extends Page {
 
                # @todo FIXME: Same limitations as described in ProtectionForm.php (line 37);
                # we expect a single selection, but the schema allows otherwise.
-               $current = array();
-               $updated = self::flattenRestrictions( $limit );
+               $isProtected = false;
+               $protect = false;
                $changed = false;
 
+               $dbw = wfGetDB( DB_MASTER );
+
                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->getRestrictionExpiry( $action ) != $expiry[$action] )
-                               {
+                       if ( !isset( $expiry[$action] ) ) {
+                               $expiry[$action] = $dbw->getInfinity();
+                       }
+                       if ( !isset( $limit[$action] ) ) {
+                               $limit[$action] = '';
+                       } elseif ( $limit[$action] != '' ) {
+                               $protect = true;
+                       }
+
+                       # Get current restrictions on $action
+                       $current = implode( '', $this->mTitle->getRestrictions( $action ) );
+                       if ( $current != '' ) {
+                               $isProtected = true;
+                       }
+
+                       if ( $limit[$action] != $current ) {
+                               $changed = true;
+                       } elseif ( $limit[$action] != '' ) {
+                               # Only check expiry change if the action is actually being
+                               # protected, since expiry does nothing on an not-protected
+                               # action.
+                               if ( $this->mTitle->getRestrictionExpiry( $action ) != $expiry[$action] ) {
                                        $changed = true;
                                }
                        }
                }
 
-               $current = self::flattenRestrictions( $current );
-
-               $changed = ( $changed || $current != $updated );
-               $changed = $changed || ( $updated && $this->mTitle->areRestrictionsCascading() != $cascade );
-               $protect = ( $updated != '' );
+               if ( !$changed && $protect && $this->mTitle->areRestrictionsCascading() != $cascade ) {
+                       $changed = true;
+               }
 
                # If nothing's changed, do nothing
-               if ( $changed ) {
-                       if ( wfRunHooks( 'ArticleProtect', array( &$this, &$user, $limit, $reason ) ) ) {
-                               $dbw = wfGetDB( DB_MASTER );
+               if ( !$changed ) {
+                       return Status::newGood();
+               }
 
-                               # Prepare a null revision to be added to the history
-                               $modified = $current != '' && $protect;
+               if ( !$protect ) { # No protection at all means unprotection
+                       $revCommentMsg = 'unprotectedarticle';
+                       $logAction = 'unprotect';
+               } elseif ( $isProtected ) {
+                       $revCommentMsg = 'modifiedarticleprotection';
+                       $logAction = 'modify';
+               } else {
+                       $revCommentMsg = 'protectedarticle';
+                       $logAction = 'protect';
+               }
 
-                               if ( $protect ) {
-                                       $comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle';
+               $encodedExpiry = array();
+               $protectDescription = '';
+               foreach ( $limit as $action => $restrictions ) {
+                       $encodedExpiry[$action] = $dbw->encodeExpiry( $expiry[$action] );
+                       if ( $restrictions != '' ) {
+                               $protectDescription .= $wgContLang->getDirMark() . "[$action=$restrictions] (";
+                               if ( $encodedExpiry[$action] != 'infinity' ) {
+                                       $protectDescription .= wfMsgForContent( 'protect-expiring',
+                                               $wgContLang->timeanddate( $expiry[$action], false, false ) ,
+                                               $wgContLang->date( $expiry[$action], false, false ) ,
+                                               $wgContLang->time( $expiry[$action], false, false ) );
                                } 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;
+                                       $protectDescription .= wfMsgForContent( 'protect-expiry-indefinite' );
                                }
 
-                               $cascade_description = '';
+                               $protectDescription .= ') ';
+                       }
+               }
+               $protectDescription = trim( $protectDescription );
 
-                               if ( $cascade ) {
-                                       $cascade_description = ' [' . wfMsgForContent( 'protect-summary-cascade' ) . ']';
-                               }
+               if ( $id ) { # Protection of existing page
+                       if ( !wfRunHooks( 'ArticleProtect', array( &$this, &$user, $limit, $reason ) ) ) {
+                               return Status::newGood();
+                       }
 
-                               if ( $reason ) {
-                                       $comment .= ": $reason";
-                               }
+                       # 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' );
 
-                               $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 .= $wgContLang->getDirMark() . "[$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' );
-                                               }
+                       # The schema allows multiple restrictions
+                       if ( !in_array( 'protect', $editrestriction ) && !in_array( 'sysop', $editrestriction ) ) {
+                               $cascade = false;
+                       }
 
-                                               $protect_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__ );
                                }
-                               $protect_description = trim( $protect_description );
+                       }
 
-                               if ( $protect_description && $protect ) {
-                                       $editComment .= " ($protect_description)";
-                               }
+                       # Prepare a null revision to be added to the history
+                       $editComment = $wgContLang->ucfirst( wfMsgForContent( $revCommentMsg, $this->mTitle->getPrefixedText() ) );
+                       if ( $reason ) {
+                               $editComment .= ": $reason";
+                       }
+                       if ( $protectDescription ) {
+                               $editComment .= " ($protectDescription)";
+                       }
+                       if ( $cascade ) {
+                               $editComment .= ' [' . wfMsgForContent( 'protect-summary-cascade' ) . ']';
+                       }
 
-                               if ( $cascade ) {
-                                       $editComment .= "$cascade_description";
-                               }
+                       # 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
+                               ), __METHOD__
+                       );
 
-                               # 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__ );
-                                       }
-                               }
+                       wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $nullRevision, $latest, $user ) );
+                       wfRunHooks( 'ArticleProtectComplete', array( &$this, &$user, $limit, $reason ) );
+               } else { # Protection of non-existing page (also known as "title protection")
+                       # Cascade protection is meaningless in this case
+                       $cascade = false;
 
-                               # 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
+                       if ( $limit['create'] != '' ) {
+                               $dbw->replace( 'protected_titles',
+                                       array( array( 'pt_namespace', 'pt_title' ) ),
+                                       array(
+                                               'pt_namespace' => $this->mTitle->getNamespace(),
+                                               'pt_title' => $this->mTitle->getDBkey(),
+                                               'pt_create_perm' => $limit['create'],
+                                               'pt_timestamp' => $dbw->encodeExpiry( wfTimestampNow() ),
+                                               'pt_expiry' => $encodedExpiry['create'],
+                                               'pt_user' => $user->getId(),
+                                               'pt_reason' => $reason,
+                                       ), __METHOD__
+                               );
+                       } else {
+                               $dbw->delete( 'protected_titles',
+                                       array(
+                                               'pt_namespace' => $this->mTitle->getNamespace(),
+                                               'pt_title' => $this->mTitle->getDBkey()
                                        ), __METHOD__
                                );
+                       }
+               }
 
-                               wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $nullRevision, $latest, $user ) );
-                               wfRunHooks( 'ArticleProtectComplete', array( &$this, &$user, $limit, $reason ) );
+               $this->mTitle->flushRestrictions();
 
-                               # 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
+               if ( $logAction == 'unprotect' ) {
+                       $logParams = array();
+               } else {
+                       $logParams = array( $protectDescription, $cascade ? 'cascade' : '' );
+               }
 
-               return true;
+               # Update the protection log
+               $log = new LogPage( 'protect' );
+               $log->addEntry( $logAction, $this->mTitle, trim( $reason ), $logParams, $user );
+
+               return Status::newGood();
        }
 
        /**
@@ -1512,79 +1916,26 @@ class WikiPage extends Page {
        }
 
        /**
-        * @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 );
-               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
+        * Same as doDeleteArticleReal(), but returns more detailed success/failure status
+        * Deletes the article with database consistency, writes logs, purges caches
+        *
+        * @param $reason string delete reason for deletion log
+        * @param $suppress int 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
+        * @param &$error Array of errors to append to
+        * @param $user User The deleting user
+        * @return boolean true if successful
         */
-       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;
+       public function doDeleteArticle(
+               $reason, $suppress = false, $id = 0, $commit = true, &$error = '', User $user = null
+       ) {
+               return $this->doDeleteArticleReal( $reason, $suppress, $id, $commit, $error, $user )
+                       == WikiPage::DELETE_SUCCESS;
        }
 
        /**
@@ -1592,40 +1943,36 @@ class WikiPage extends Page {
         * Deletes the article with database consistency, writes logs, purges caches
         *
         * @param $reason string delete reason for deletion log
-        * @param $suppress bitfield
+        * @param $suppress int 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
-        * @param &$errors Array of errors to append to
-        * @param $user User The relevant user
-        * @return boolean true if successful
+        * @param &$error Array of errors to append to
+        * @param $user User The deleting user
+        * @return int: One of WikiPage::DELETE_* constants
         */
-       public function doDeleteArticle(
+       public function doDeleteArticleReal(
                $reason, $suppress = false, $id = 0, $commit = true, &$error = '', User $user = null
        ) {
-               global $wgUseTrackbacks, $wgUser;
+               global $wgUser;
                $user = is_null( $user ) ? $wgUser : $user;
 
                wfDebug( __METHOD__ . "\n" );
 
                if ( ! wfRunHooks( 'ArticleDelete', array( &$this, &$user, &$reason, &$error ) ) ) {
-                       return false;
+                       return WikiPage::DELETE_HOOK_ABORTED;
                }
                $dbw = wfGetDB( DB_MASTER );
                $t = $this->mTitle->getDBkey();
                $id = $id ? $id : $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE );
 
                if ( $t === '' || $id == 0 ) {
-                       return false;
+                       return WikiPage::DELETE_NO_PAGE;
                }
 
-               DeferredUpdates::addUpdate(
-                       new SiteStatsUpdate( 0, 1, - (int)$this->isCountable(), -1 )
-               );
-
                // Bitfields to further suppress the content
                if ( $suppress ) {
                        $bitfield = 0;
@@ -1638,7 +1985,7 @@ class WikiPage extends Page {
                        $bitfield = 'rev_deleted';
                }
 
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
                // 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
@@ -1673,18 +2020,48 @@ class WikiPage extends 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
+               $ok = ( $dbw->affectedRows() > 0 ); // getArticleID() uses slave, could be laggy
 
                if ( !$ok ) {
-                       $dbw->rollback();
-                       return false;
+                       $dbw->rollback( __METHOD__ );
+                       return WikiPage::DELETE_NO_REVISIONS;
+               }
+
+               $this->doDeleteUpdates( $id );
+
+               # Log the deletion, if the page was suppressed, log it at Oversight instead
+               $logtype = $suppress ? 'suppress' : 'delete';
+
+               $logEntry = new ManualLogEntry( $logtype, 'delete' );
+               $logEntry->setPerformer( $user );
+               $logEntry->setTarget( $this->mTitle );
+               $logEntry->setComment( $reason );
+               $logid = $logEntry->insert();
+               $logEntry->publish( $logid );
+
+               if ( $commit ) {
+                       $dbw->commit( __METHOD__ );
                }
 
+               wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$user, $reason, $id ) );
+               return WikiPage::DELETE_SUCCESS;
+       }
+
+       /**
+        * Do some database updates after deletion
+        *
+        * @param $id Int: page_id value of the page being deleted
+        */
+       public function doDeleteUpdates( $id ) {
+               DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 1, - (int)$this->isCountable(), -1 ) );
+
+               $dbw = wfGetDB( DB_MASTER );
+
+               # Delete restrictions for it
+               $dbw->delete( 'page_restrictions', array ( 'pr_page' => $id ), __METHOD__ );
+
                # Fix category table counts
                $cats = array();
                $res = $dbw->select( 'categorylinks', 'cl_to', array( 'cl_from' => $id ), __METHOD__ );
@@ -1699,10 +2076,6 @@ class WikiPage extends Page {
                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 ), __METHOD__ );
                        $dbw->delete( 'imagelinks', array( 'il_from' => $id ), __METHOD__ );
@@ -1731,25 +2104,11 @@ class WikiPage extends Page {
                # Clear caches
                self::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';
-
-               $logEntry = new ManualLogEntry( $logtype, 'delete' );
-               $logEntry->setPerformer( $user );
-               $logEntry->setTarget( $this->mTitle );
-               $logEntry->setComment( $reason );
-               $logid = $logEntry->insert();
-               $logEntry->publish( $logid );
-
-               if ( $commit ) {
-                       $dbw->commit();
-               }
+               # Reset this object
+               $this->clear();
 
-               wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$user, $reason, $id ) );
-               return true;
+               # Clear the cached article id so the interface doesn't act like we exist
+               $this->mTitle->resetArticleID( 0 );
        }
 
        /**
@@ -1816,6 +2175,7 @@ class WikiPage extends Page {
         *
         * @param $resultDetails Array: contains result-specific array of additional values
         * @param $guser User The user performing the rollback
+        * @return array
         */
        public function commitRollback( $fromP, $summary, $bot, &$resultDetails, User $guser ) {
                global $wgUseRCPatrol, $wgContLang;
@@ -1827,7 +2187,7 @@ class WikiPage extends Page {
                }
 
                # Get the last editor
-               $current = Revision::newFromTitle( $this->mTitle );
+               $current = $this->getRevision();
                if ( is_null( $current ) ) {
                        # Something wrong... no page?
                        return array( array( 'notanarticle' ) );
@@ -1916,298 +2276,23 @@ class WikiPage extends Page {
                }
 
                # Actually store the edit
-               $status = $this->doEdit( $target->getText(), $summary, $flags, $target->getId() );
+               $status = $this->doEdit( $target->getText(), $summary, $flags, $target->getId(), $guser );
                if ( !empty( $status->value['revision'] ) ) {
                        $revId = $status->value['revision']->getId();
                } else {
                        $revId = false;
                }
 
-               wfRunHooks( 'ArticleRollbackComplete', array( $this, $guser, $target, $current ) );
-
-               $resultDetails = array(
-                       'summary' => $summary,
-                       'current' => $current,
-                       'target'  => $target,
-                       'newid'   => $revId
-               );
-
-               return array();
-       }
-
-       /**
-        * Do standard deferred updates after page view
-        * @param $user User The relevant user
-        */
-       public function doViewUpdates( User $user ) {
-               global $wgDisableCounters;
-               if ( wfReadOnly() ) {
-                       return;
-               }
-
-               # Don't update page view counters on views from bot users (bug 14044)
-               if ( !$wgDisableCounters && !$user->isAllowed( 'bot' ) && $this->getId() ) {
-                       DeferredUpdates::addUpdate( new ViewCountUpdate( $this->getId() ) );
-                       DeferredUpdates::addUpdate( new SiteStatsUpdate( 1, 0, 0 ) );
-               }
-
-               # Update newtalk / watchlist notification status
-               $user->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 ) {
-               global $wgParser, $wgContLang, $wgUser;
-               $user = is_null( $user ) ? $wgUser : $user;
-               // @TODO fixme: check $user->getId() here???
-               if ( $this->mPreparedEdit
-                       && $this->mPreparedEdit->newText == $text
-                       && $this->mPreparedEdit->revid == $revid
-               ) {
-                       // Already prepared
-                       return $this->mPreparedEdit;
-               }
-
-               $popts = ParserOptions::newFromUserAndLang( $user, $wgContLang );
-               wfRunHooks( 'ArticlePrepareTextForEdit', array( $this, $popts ) );
-
-               $edit = (object)array();
-               $edit->revid = $revid;
-               $edit->newText = $text;
-               $edit->pst = $this->preSaveTransform( $text, $user, $popts );
-               $edit->popts = $this->makeParserOptions( 'canonical' );
-               $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $edit->popts, true, true, $revid );
-               $edit->oldText = $this->getRawText();
-
-               $this->mPreparedEdit = $edit;
-
-               return $edit;
-       }
-
-       /**
-        * Do standard deferred updates after page edit.
-        * Update links tables, site stats, search index and message cache.
-        * Purges pages that include this page if the text was changed here.
-        * Every 100th edit, prune the recent changes table.
-        *
-        * @private
-        * @param $revision Revision object
-        * @param $user User object that did the revision
-        * @param $options Array of options, following indexes are used:
-        * - changed: boolean, whether the revision changed the content (default true)
-        * - created: boolean, whether the revision created the page (default false)
-        * - oldcountable: boolean or null (default null):
-        *   - boolean: whether the page was counted as an article before that
-        *     revision, only used in changed is true and created is false
-        *   - null: don't change the article count
-        */
-       public function doEditUpdates( Revision $revision, User $user, array $options = array() ) {
-               global $wgEnableParserCache;
-
-               wfProfileIn( __METHOD__ );
-
-               $options += array( 'changed' => true, 'created' => false, 'oldcountable' => null );
-               $text = $revision->getText();
-
-               # 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, $revision->getId(), $user );
-               } else {
-                       wfDebug( __METHOD__ . ": No vary-revision, using prepared edit...\n" );
-                       $editInfo = $this->mPreparedEdit;
-               }
-
-               # Save it to the parser cache
-               if ( $wgEnableParserCache ) {
-                       $parserCache = ParserCache::singleton();
-                       $parserCache->save( $editInfo->output, $this, $editInfo->popts );
-               }
-
-               # Update the links tables
-               $u = new LinksUpdate( $this->mTitle, $editInfo->output );
-               $u->doUpdate();
-
-               wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $options['changed'] ) );
-
-               if ( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
-                       if ( 0 == mt_rand( 0, 99 ) ) {
-                               // Flush old entries from the `recentchanges` table; we do this on
-                               // random requests so as to avoid an increase in writes for no good reason
-                               global $wgRCMaxAge;
-
-                               $dbw = wfGetDB( DB_MASTER );
-                               $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
-                               $dbw->delete(
-                                       'recentchanges',
-                                       array( "rc_timestamp < '$cutoff'" ),
-                                       __METHOD__
-                               );
-                       }
-               }
-
-               $id = $this->getId();
-               $title = $this->mTitle->getPrefixedDBkey();
-               $shortTitle = $this->mTitle->getDBkey();
-
-               if ( 0 == $id ) {
-                       wfProfileOut( __METHOD__ );
-                       return;
-               }
-
-               if ( !$options['changed'] ) {
-                       $good = 0;
-                       $total = 0;
-               } elseif ( $options['created'] ) {
-                       $good = (int)$this->isCountable( $editInfo );
-                       $total = 1;
-               } elseif ( $options['oldcountable'] !== null ) {
-                       $good = (int)$this->isCountable( $editInfo ) - (int)$options['oldcountable'];
-                       $total = 0;
-               } else {
-                       $good = 0;
-                       $total = 0;
-               }
-
-               DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 1, $good, $total ) );
-               DeferredUpdates::addUpdate( new SearchUpdate( $id, $title, $text ) );
-
-               # If this is another user's talk page, update newtalk.
-               # Don't do this if $options['changed'] = false (null-edits) nor if
-               # it's a minor edit and the user doesn't want notifications for those.
-               if ( $options['changed']
-                       && $this->mTitle->getNamespace() == NS_USER_TALK
-                       && $shortTitle != $user->getTitleKey()
-                       && !( $revision->isMinor() && $user->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" );
-                               }
-                       }
-               }
-
-               if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                       MessageCache::singleton()->replace( $shortTitle, $text );
-               }
-
-               if( $options['created'] ) {
-                       self::onArticleCreate( $this->mTitle );
-               } else {
-                       self::onArticleEdit( $this->mTitle );
-               }
-
-               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 doEditUpdates and such so it's not needed
-        * anymore.
-        * @deprecated since 1.18, use doEditUpdates()
-        */
-       public function createUpdates( $rev ) {
-               global $wgUser;
-               $this->doEditUpdates( $rev, $wgUser, array( 'created' => true ) );
-       }
-
-       /**
-        * 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
-        * @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, $wgUser;
-               $user = is_null( $user ) ? $wgUser : $user;
-
-               if ( $popts === null ) {
-                       $popts = ParserOptions::newFromUser( $user );
-               }
-
-               return $wgParser->preSaveTransform( $text, $this->mTitle, $user, $popts );
-       }
-
-       /**
-        * 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 $user User The relevant user
-        * @param $comment String: comment submitted
-        * @param $minor Boolean: whereas it's a minor modification
-        */
-       public function doQuickEdit( $text, User $user, $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 );
+               wfRunHooks( 'ArticleRollbackComplete', array( $this, $guser, $target, $current ) );
 
-               wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $user ) );
+               $resultDetails = array(
+                       'summary' => $summary,
+                       'current' => $current,
+                       'target'  => $target,
+                       'newid'   => $revId
+               );
 
-               wfProfileOut( __METHOD__ );
+               return array();
        }
 
        /**
@@ -2273,7 +2358,9 @@ class WikiPage extends Page {
                # User talk pages
                if ( $title->getNamespace() == NS_USER_TALK ) {
                        $user = User::newFromName( $title->getText(), false );
-                       $user->setNewtalk( false );
+                       if ( $user ) {
+                               $user->setNewtalk( false );
+                       }
                }
 
                # Image redirects
@@ -2303,35 +2390,6 @@ class WikiPage extends Page {
 
        /**#@-*/
 
-       /**
-        * Return a list of templates used by this article.
-        * Uses the templatelinks table
-        *
-        * @return Array of Title objects
-        */
-       public function getUsedTemplates() {
-               $result = array();
-               $id = $this->mTitle->getArticleID();
-
-               if ( $id == 0 ) {
-                       return array();
-               }
-
-               $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 );
-                       }
-               }
-
-               return $result;
-       }
-
        /**
         * Returns a list of hidden categories this page is a member of.
         * Uses the page_props and categorylinks tables.
@@ -2427,9 +2485,8 @@ class WikiPage extends Page {
        public function getAutoDeleteReason( &$hasHistory ) {
                global $wgContLang;
 
-               $dbw = wfGetDB( DB_MASTER );
                // Get the last revision
-               $rev = Revision::newFromTitle( $this->getTitle() );
+               $rev = $this->getRevision();
 
                if ( is_null( $rev ) ) {
                        return false;
@@ -2450,6 +2507,8 @@ class WikiPage extends Page {
                        }
                }
 
+               $dbw = wfGetDB( DB_MASTER );
+
                // Find out if there was only one contributor
                // Only scan the last 20 revisions
                $res = $dbw->select( 'revision', 'rev_user_text',
@@ -2511,23 +2570,6 @@ class WikiPage extends Page {
                return $reason;
        }
 
-       /**
-       * Get parser options suitable for rendering the primary article wikitext
-       * @param User|string $user User object or 'canonical'
-       * @return ParserOptions
-       */
-       public function makeParserOptions( $user ) {
-               global $wgContLang;
-               if ( $user instanceof User ) { // settings per user (even anons)
-                       $options = ParserOptions::newFromUser( $user );
-               } else { // canonical settings
-                       $options = ParserOptions::newFromUserAndLang( new User, $wgContLang );
-               }
-               $options->enableLimitReport(); // show inclusion/loop reports
-               $options->setTidy( true ); // fix bad HTML
-               return $options;
-       }
-
        /**
         * Update all the appropriate counts in the category table, given that
         * we've added the categories $added and deleted the categories $deleted.
@@ -2642,10 +2684,107 @@ class WikiPage extends Page {
                }
        }
 
+       /**
+        * Return a list of templates used by this article.
+        * Uses the templatelinks table
+        *
+        * @deprecated in 1.19; use Title::getTemplateLinksFrom()
+        * @return Array of Title objects
+        */
+       public function getUsedTemplates() {
+               return $this->mTitle->getTemplateLinksFrom();
+       }
+
+       /**
+        * 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 doEditUpdates and such so it's not needed
+        * anymore.
+        * @deprecated since 1.18, use doEditUpdates()
+        */
+       public function createUpdates( $rev ) {
+               wfDeprecated( __METHOD__, '1.18' );
+               global $wgUser;
+               $this->doEditUpdates( $rev, $wgUser, array( 'created' => true ) );
+       }
+
+       /**
+        * This function is called right before saving the wikitext,
+        * so we can do things like signatures and links-in-context.
+        *
+        * @deprecated in 1.19; use Parser::preSaveTransform() instead
+        * @param $text String article contents
+        * @param $user User object: user doing the edit
+        * @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, $wgUser;
+
+               wfDeprecated( __METHOD__, '1.19' );
+
+               $user = is_null( $user ) ? $wgUser : $user;
+
+               if ( $popts === null ) {
+                       $popts = ParserOptions::newFromUser( $user );
+               }
+
+               return $wgParser->preSaveTransform( $text, $this->mTitle, $user, $popts );
+       }
+
+       /**
+        * Check whether the number of revisions of this page surpasses $wgDeleteRevisionsLimit
+        *
+        * @deprecated in 1.19; use Title::isBigDeletion() instead.
+        * @return bool
+        */
+       public function isBigDeletion() {
+               wfDeprecated( __METHOD__, '1.19' );
+               return $this->mTitle->isBigDeletion();
+       }
+
+       /**
+        * Get the  approximate revision count of this page.
+        *
+        * @deprecated in 1.19; use Title::estimateRevisionCount() instead.
+        * @return int
+        */
+       public function estimateRevisionCount() {
+               wfDeprecated( __METHOD__, '1.19' );
+               return $this->mTitle->estimateRevisionCount();
+       }
+
+       /**
+        * Update the article's restriction field, and leave a log entry.
+        *
+        * @deprecated since 1.19
+        * @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
+        * @param $user User The user updating the restrictions
+        * @return bool true on success
+        */
+       public function updateRestrictions(
+               $limit = array(), $reason = '', &$cascade = 0, $expiry = array(), User $user = null
+       ) {
+               global $wgUser;
+
+               $user = is_null( $user ) ? $wgUser : $user;
+
+               return $this->doUpdateRestrictions( $limit, $expiry, $cascade, $reason, $user )->isOK();
+       }
+
        /**
         * @deprecated since 1.18
         */
        public function quickEdit( $text, $comment = '', $minor = 0 ) {
+               wfDeprecated( __METHOD__, '1.18' );
                global $wgUser;
                return $this->doQuickEdit( $text, $wgUser, $comment, $minor );
        }
@@ -2654,15 +2793,198 @@ class WikiPage extends Page {
         * @deprecated since 1.18
         */
        public function viewUpdates() {
+               wfDeprecated( __METHOD__, '1.18' );
                global $wgUser;
                return $this->doViewUpdates( $wgUser );
        }
 
        /**
         * @deprecated since 1.18
+        * @return bool
         */
        public function useParserCache( $oldid ) {
+               wfDeprecated( __METHOD__, '1.18' );
                global $wgUser;
-               return $this->isParserCacheUsed( $wgUser, $oldid );
+               return $this->isParserCacheUsed( ParserOptions::newFromUser( $wgUser ), $oldid );
+       }
+}
+
+class PoolWorkArticleView extends PoolCounterWork {
+
+       /**
+        * @var Page
+        */
+       private $page;
+
+       /**
+        * @var string
+        */
+       private $cacheKey;
+
+       /**
+        * @var integer
+        */
+       private $revid;
+
+       /**
+        * @var ParserOptions
+        */
+       private $parserOptions;
+
+       /**
+        * @var string|null
+        */
+       private $text;
+
+       /**
+        * @var ParserOutput|bool
+        */
+       private $parserOutput = false;
+
+       /**
+        * @var bool
+        */
+       private $isDirty = false;
+
+       /**
+        * @var Status|bool
+        */
+       private $error = false;
+
+       /**
+        * Constructor
+        *
+        * @param $page Page
+        * @param $revid Integer: ID of the revision being parsed
+        * @param $useParserCache Boolean: whether to use the parser cache
+        * @param $parserOptions parserOptions to use for the parse operation
+        * @param $text String: text to parse or null to load it
+        */
+       function __construct( Page $page, ParserOptions $parserOptions, $revid, $useParserCache, $text = null ) {
+               $this->page = $page;
+               $this->revid = $revid;
+               $this->cacheable = $useParserCache;
+               $this->parserOptions = $parserOptions;
+               $this->text = $text;
+               $this->cacheKey = ParserCache::singleton()->getKey( $page, $parserOptions );
+               parent::__construct( 'ArticleView', $this->cacheKey . ':revid:' . $revid );
+       }
+
+       /**
+        * Get the ParserOutput from this object, or false in case of failure
+        *
+        * @return ParserOutput
+        */
+       public function getParserOutput() {
+               return $this->parserOutput;
+       }
+
+       /**
+        * Get whether the ParserOutput is a dirty one (i.e. expired)
+        *
+        * @return bool
+        */
+       public function getIsDirty() {
+               return $this->isDirty;
+       }
+
+       /**
+        * Get a Status object in case of error or false otherwise
+        *
+        * @return Status|bool
+        */
+       public function getError() {
+               return $this->error;
+       }
+
+       /**
+        * @return bool
+        */
+       function doWork() {
+               global $wgParser, $wgUseFileCache;
+
+               $isCurrent = $this->revid === $this->page->getLatest();
+
+               if ( $this->text !== null ) {
+                       $text = $this->text;
+               } elseif ( $isCurrent ) {
+                       $text = $this->page->getRawText();
+               } else {
+                       $rev = Revision::newFromTitle( $this->page->getTitle(), $this->revid );
+                       if ( $rev === null ) {
+                               return false;
+                       }
+                       $text = $rev->getText();
+               }
+
+               $time = - microtime( true );
+               $this->parserOutput = $wgParser->parse( $text, $this->page->getTitle(),
+                       $this->parserOptions, true, true, $this->revid );
+               $time += microtime( true );
+
+               # Timing hack
+               if ( $time > 3 ) {
+                       wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time,
+                               $this->page->getTitle()->getPrefixedDBkey() ) );
+               }
+
+               if ( $this->cacheable && $this->parserOutput->isCacheable() ) {
+                       ParserCache::singleton()->save( $this->parserOutput, $this->page, $this->parserOptions );
+               }
+
+               // Make sure file cache is not used on uncacheable content.
+               // Output that has magic words in it can still use the parser cache
+               // (if enabled), though it will generally expire sooner.
+               if ( !$this->parserOutput->isCacheable() || $this->parserOutput->containsOldMagic() ) {
+                       $wgUseFileCache = false;
+               }
+
+               if ( $isCurrent ) {
+                       $this->page->doCascadeProtectionUpdates( $this->parserOutput );
+               }
+
+               return true;
+       }
+
+       /**
+        * @return bool
+        */
+       function getCachedWork() {
+               $this->parserOutput = ParserCache::singleton()->get( $this->page, $this->parserOptions );
+
+               if ( $this->parserOutput === false ) {
+                       wfDebug( __METHOD__ . ": parser cache miss\n" );
+                       return false;
+               } else {
+                       wfDebug( __METHOD__ . ": parser cache hit\n" );
+                       return true;
+               }
+       }
+
+       /**
+        * @return bool
+        */
+       function fallback() {
+               $this->parserOutput = ParserCache::singleton()->getDirty( $this->page, $this->parserOptions );
+
+               if ( $this->parserOutput === false ) {
+                       wfDebugLog( 'dirty', "dirty missing\n" );
+                       wfDebug( __METHOD__ . ": no dirty cache\n" );
+                       return false;
+               } else {
+                       wfDebug( __METHOD__ . ": sending dirty output\n" );
+                       wfDebugLog( 'dirty', "dirty output {$this->cacheKey}\n" );
+                       $this->isDirty = true;
+                       return true;
+               }
+       }
+
+       /**
+        * @param $status Status
+        * @return bool
+        */
+       function error( $status ) {
+               $this->error = $status;
+               return false;
        }
 }