doEdit(), etc
[lhc/web/wiklou.git] / includes / WikiPage.php
index 1d7f2fa..6bd5e4c 100644 (file)
@@ -15,29 +15,42 @@ abstract class Page {}
 class WikiPage extends Page {
        /**
         * @var Title
-        * @protected
         */
        public $mTitle = null;
 
        /**@{{
         * @protected
         */
-       public $mCounter = -1;               // !< Integer (-1 means "not loaded")
        public $mDataLoaded = false;         // !< Boolean
        public $mIsRedirect = false;         // !< Boolean
-       public $mLatest = false;             // !< Boolean
-       public $mPreparedEdit = false;           // !< Array
-       public $mRedirectTarget = null;          // !< Title object
-       public $mLastRevision = null;            // !< Revision object
-       public $mTimestamp = '';             // !< String
-       public $mTouched = '19700101000000'; // !< String
+       public $mLatest = false;             // !< Integer (false means "not loaded")
+       public $mPreparedEdit = false;       // !< Array
        /**@}}*/
 
        /**
-        * @protected
-        * @var ParserOptions: ParserOptions object for $wgUser articles
+        * @var Title
+        */
+       protected $mRedirectTarget = null;
+
+       /**
+        * @var Revision
+        */
+       protected $mLastRevision = null;
+
+       /**
+        * @var string; timestamp of the current revision or empty string if not loaded
+        */
+       protected $mTimestamp = '';
+
+       /**
+        * @var string
         */
-       public $mParserOptions;
+       protected $mTouched = '19700101000000';
+
+       /**
+        * @var int|null
+        */
+       protected $mCounter = null;
 
        /**
         * Constructor and clear the article
@@ -54,9 +67,15 @@ class WikiPage extends Page {
         * @return WikiPage object of the appropriate type
         */
        public static function factory( Title $title ) {
-               switch( $title->getNamespace() ) {
-                       case NS_MEDIA:
-                               throw new MWException( "NS_MEDIA is a virtual namespace" );
+               $ns = $title->getNamespace();
+
+               if ( $ns == NS_MEDIA ) {
+                       throw new MWException( "NS_MEDIA is a virtual namespace; use NS_FILE." );
+               } elseif ( $ns < 0 ) {
+                       throw new MWException( "Invalid or virtual namespace $ns given." );
+               }
+
+               switch ( $ns ) {
                        case NS_FILE:
                                $page = new WikiFilePage( $title );
                                break;
@@ -73,15 +92,16 @@ class WikiPage extends Page {
        /**
         * Constructor from a page id
         *
-        * Always override this for all subclasses (until we use PHP with LSB)
-        *
         * @param $id Int article ID to load
+        *
+        * @return WikiPage
         */
        public static function newFromID( $id ) {
                $t = Title::newFromID( $id );
-               # @todo FIXME: Doesn't inherit right
-               return $t == null ? null : new self( $t );
-               # return $t == null ? null : new static( $t ); // PHP 5.3
+               if ( $t ) {
+                       return self::factory( $t );
+               }
+               return null;
        }
 
        /**
@@ -90,131 +110,14 @@ class WikiPage extends Page {
         * (and only when) $wgActions[$action] === true. This allows subclasses
         * to override the default behavior.
         *
+        * @todo: move this UI stuff somewhere else
+        *
         * @return Array
         */
        public function getActionOverrides() {
                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->getNamespace() == NS_SPECIAL ) {
-                                       // Gotta handle redirects to special pages differently:
-                                       // Fill the HTTP response "Location" header and ignore
-                                       // the rest of the page we're on.
-                                       //
-                                       // This can be hard to reverse, so they may be disabled.
-                                       if ( $rt->isSpecial( 'Userlogout' ) ) {
-                                               // rolleyes
-                                       } else {
-                                               return $rt->getFullURL();
-                                       }
-                               }
-
-                               return $rt;
-                       }
-               }
-
-               // No or invalid redirect
-               return false;
-       }
-
        /**
         * Get the title object of the article
         * @return Title object of this page
@@ -229,49 +132,21 @@ 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.
+        *
+        * @return array
         */
        public static function selectFields() {
                return array(
@@ -286,6 +161,7 @@ class WikiPage extends Page {
                        'page_touched',
                        'page_latest',
                        'page_len',
+            'page_content_model',
                );
        }
 
@@ -340,19 +216,27 @@ class WikiPage extends Page {
         *              A DB query result object or...
         *              "fromdb" to get from a slave DB or...
         *              "fromdbmaster" to get from the master DB
+        * @return void
         */
        public function loadPageData( $data = 'fromdb' ) {
-               if ( $data === 'fromdb' || $data === 'fromdbmaster' ) {
-                       $db = ( $data == 'fromdbmaster' )
-                               ? wfGetDB( DB_MASTER )
-                               : wfGetDB( DB_SLAVE );
-                       $data = $this->pageDataFromTitle( $db, $this->mTitle );
+               if ( $data === 'fromdbmaster' ) {
+                       $data = $this->pageDataFromTitle( wfGetDB( DB_MASTER ), $this->mTitle );
+               } elseif ( $data === 'fromdb' ) { // slave
+                       $data = $this->pageDataFromTitle( wfGetDB( DB_SLAVE ), $this->mTitle );
+                       # Use a "last rev inserted" timestamp key to dimish the issue of slave lag.
+                       # Note that DB also stores the master position in the session and checks it.
+                       $touched = $this->getCachedLastEditTime();
+                       if ( $touched ) { // key set
+                               if ( !$data || $touched > wfTimestamp( TS_MW, $data->page_touched ) ) {
+                                       $data = $this->pageDataFromTitle( wfGetDB( DB_MASTER ), $this->mTitle );
+                               }
+                       }
                }
 
                $lc = LinkCache::singleton();
 
                if ( $data ) {
-                       $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect, $data->page_latest );
+                       $lc->addGoodLinkObjFromRow( $this->mTitle, $data );
 
                        $this->mTitle->loadFromRow( $data );
 
@@ -383,7 +267,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();
        }
 
        /**
@@ -395,90 +279,66 @@ 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
+        * Tests if the article text represents a redirect
         *
-        * @param $editInfo Object or false: object returned by prepareTextForEdit(),
-        *        if false, the current database state will be used
-        * @return Boolean
+        * @param $text mixed string containing article contents, or boolean
+        * @return bool
         */
-       public function isCountable( $editInfo = false ) {
-               global $wgArticleCountMethod;
+       public function isRedirect( $text = false ) {
+        if ( $text === false ) $content = $this->getContent();
+        else $content = ContentHandler::makeContent( $text, $this->mTitle ); # TODO: allow model and format to be provided; or better, expect a Content object
 
-               if ( !$this->mTitle->isContentPage() ) {
-                       return false;
-               }
 
-               $text = $editInfo ? $editInfo->pst : false;
+        if ( empty( $content ) ) return false;
+        else return $content->isRedirect();
+       }
 
-               if ( $this->isRedirect( $text ) ) {
-                       return false;
+       /**
+        * 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;
+       }
 
-               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__ );
-                       }
+       /**
+        * Get the page_touched field
+        * @return string containing GMT timestamp
+        */
+       public function getTouched() {
+               if ( !$this->mDataLoaded ) {
+                       $this->loadPageData();
                }
+               return $this->mTouched;
        }
 
        /**
-        * Tests if the article text represents a redirect
-        *
-        * @param $text mixed string containing article contents, or boolean
-        * @return bool
+        * Get the page_latest field
+        * @return integer rev_id of current revision
         */
-       public function isRedirect( $text = false ) {
-               if ( $text === false ) {
-                       if ( !$this->mDataLoaded ) {
-                               $this->loadPageData();
-                       }
-
-                       return (bool)$this->mIsRedirect;
-               } else {
-                       return Title::newFromRedirect( $text ) !== null;
+       public function getLatest() {
+               if ( !$this->mDataLoaded ) {
+                       $this->loadPageData();
                }
+               return (int)$this->mLatest;
        }
 
        /**
@@ -521,6 +381,23 @@ class WikiPage extends Page {
                return null;
        }
 
+    /**
+     * Get the content of the current revision. No side-effects...
+     *
+     * @param $audience Integer: one of:
+     *      Revision::FOR_PUBLIC       to be displayed to all users
+     *      Revision::FOR_THIS_USER    to be displayed to $wgUser
+     *      Revision::RAW              get the text regardless of permissions
+     * @return Content|null The content of the current revision
+     */
+    public function getContent( $audience = Revision::FOR_PUBLIC ) {
+        $this->loadLastEdit();
+        if ( $this->mLastRevision ) {
+            return $this->mLastRevision->getContent( $audience );
+        }
+        return false;
+    }
+
        /**
         * Get the text of the current revision. No side-effects...
         *
@@ -529,8 +406,10 @@ class WikiPage extends Page {
         *      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
-        */     
-       public function getText( $audience = Revision::FOR_PUBLIC ) {
+     * @deprecated as of 1.20, getContent() should be used instead.
+        */
+       public function getText( $audience = Revision::FOR_PUBLIC ) { #FIXME: deprecated, replace usage!
+        wfDeprecated( __METHOD__, '1.20' );
                $this->loadLastEdit();
                if ( $this->mLastRevision ) {
                        return $this->mLastRevision->getText( $audience );
@@ -543,19 +422,27 @@ class WikiPage extends Page {
         *
         * @return String|false The text of the current revision
         */
-       public function getRawText() {
-               $this->loadLastEdit();
-               if ( $this->mLastRevision ) {
-                       return $this->mLastRevision->getRawText();
-               }
-               return false;
+       public function getRawText() { #FIXME: deprecated, replace usage!
+               return $this->getText( Revision::RAW );
        }
 
+    /**
+     * Get the content of the current revision. No side-effects...
+     *
+     * @return Contet|false The text of the current revision
+     */
+    protected function getNativeData() { #FIXME: examine all uses carefully! caller must be aware of content model!
+        $content = $this->getContent( Revision::RAW );
+        if ( !$content ) return null;
+
+        return $content->getNativeData();
+    }
+
        /**
         * @return string MW timestamp of last article revision
         */
        public function getTimestamp() {
-               // Check if the field has been filled by ParserCache::get()
+               // Check if the field has been filled by WikiPage::setTimestamp()
                if ( !$this->mTimestamp ) {
                        $this->loadLastEdit();
                }
@@ -634,48 +521,239 @@ 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.
+       protected function getCachedLastEditTime() {
+               global $wgMemc;
+               $key = wfMemcKey( 'page-lastedit', md5( $this->mTitle->getPrefixedDBkey() ) );
+               return $wgMemc->get( $key );
+       }
 
-               $dbr = wfGetDB( DB_SLAVE );
+       /**
+        * 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 );
+       }
 
-               if ( $dbr->implicitGroupby() ) {
-                       $realNameField = 'user_real_name';
-               } else {
-                       $realNameField = 'FIRST(user_real_name) AS user_real_name';
+       /**
+        * 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;
                }
 
-               $tables = array( 'revision', 'user' );
+        if ( $editInfo ) {
+            $content = ContentHandler::makeContent( $editInfo->pst, $this->mTitle );
+            # TODO: take model and format from edit info!
+        } else {
+            $content = $this->getContent();
+        }
 
-               $fields = array(
-                       'rev_user as user_id',
-                       'rev_user_text AS user_name',
-                       $realNameField,
-                       'MAX(rev_timestamp) AS timestamp',
-               );
+               if ( !$content || $content->isRedirect( ) ) {
+                       return false;
+               }
 
-               $conds = array( 'rev_page' => $this->getId() );
+        $hasLinks = null;
 
-               // The user who made the top revision gets credited as "this page was last edited by
-               // John, based on contributions by Tom, Dick and Harry", so don't include them twice.
-               $user = $this->getUser();
-               if ( $user ) {
-                       $conds[] = "rev_user != $user";
-               } else {
-                       $conds[] = "rev_user_text != {$dbr->addQuotes( $this->getUserText() )}";
-               }
+        if ( $wgArticleCountMethod === 'link' ) {
+            # nasty special case to avoid re-parsing to detect links
 
-               $conds[] = "{$dbr->bitAnd( 'rev_deleted', Revision::DELETED_USER )} = 0"; // username hidden?
+            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.
+                $hasLinks = (bool)count( $editInfo->output->getLinks() );
+            } else {
+                $hasLinks = (bool)wfGetDB( DB_SLAVE )->selectField( 'pagelinks', 1,
+                    array( 'pl_from' => $this->getId() ), __METHOD__ );
+            }
+        }
 
-               $jconds = array(
-                       'user' => array( 'LEFT JOIN', 'rev_user = user_id' ),
-               );
+               return $content->isCountable( $hasLinks );
+       }
 
-               $options = 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() ); #FIXME: move this to Content object
+               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' );
+
+               $fields = array(
+                       'rev_user as user_id',
+                       'rev_user_text AS user_name',
+                       $realNameField,
+                       'MAX(rev_timestamp) AS timestamp',
+               );
+
+               $conds = array( 'rev_page' => $this->getId() );
+
+               // The user who made the top revision gets credited as "this page was last edited by
+               // John, based on contributions by Tom, Dick and Harry", so don't include them twice.
+               $user = $this->getUser();
+               if ( $user ) {
+                       $conds[] = "rev_user != $user";
+               } else {
+                       $conds[] = "rev_user_text != {$dbr->addQuotes( $this->getUserText() )}";
+               }
+
+               $conds[] = "{$dbr->bitAnd( 'rev_deleted', Revision::DELETED_USER )} = 0"; // username hidden?
+
+               $jconds = array(
+                       'user' => array( 'LEFT JOIN', 'rev_user = user_id' ),
+               );
+
+               $options = array(
                        'GROUP BY' => array( 'rev_user', 'rev_user_text' ),
                        'ORDER BY' => 'timestamp DESC',
                );
@@ -684,21 +762,132 @@ 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()
-                       && empty( $oldid )
-                       && !$this->mTitle->isCssOrJsPage()
-                       && !$this->mTitle->isCssJsSubpage();
+                       && $parserOptions->getStubThreshold() == 0
+                       && $this->mTitle->exists()
+                       && ( $oldid === null || $oldid === 0 || $oldid === $this->getLatest() )
+                       && $this->mTitle->isWikitextPage(); #FIXME: ask ContentHandler if cachable!
+       }
+
+       /**
+        * 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 );
        }
 
        /**
@@ -726,14 +915,15 @@ class WikiPage extends Page {
                }
 
                if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                       if ( $this->getId() == 0 ) {
-                               $text = false;
+                       if ( $this->mTitle->exists() ) {
+                               $text = $this->getNativeData(); #FIXME: may not be a string. check Content model!
                        } else {
-                               $text = $this->getRawText();
+                               $text = false;
                        }
 
                        MessageCache::singleton()->replace( $this->mTitle->getDBkey(), $text );
                }
+               return true;
        }
 
        /**
@@ -745,7 +935,6 @@ class WikiPage extends Page {
         *
         * @param $dbw DatabaseBase
         * @return int The newly created page_id key, or false if the title already existed
-        * @private
         */
        public function insertOn( $dbw ) {
                wfProfileIn( __METHOD__ );
@@ -781,7 +970,7 @@ class WikiPage extends Page {
         *
         * @param $dbw DatabaseBase: object
         * @param $revision Revision: For ID number, and text used to set
-                                               length and redirect status fields
+        *                  length and redirect status fields
         * @param $lastRevision Integer: if given, will not overwrite the page field
         *                      when different from the currently set value.
         *                      Giving 0 indicates the new page flag should be set
@@ -795,6 +984,7 @@ class WikiPage extends Page {
                wfProfileIn( __METHOD__ );
 
                $text = $revision->getText();
+               $len = strlen( $text );
                $rt = Title::newFromRedirectRecurse( $text );
 
                $conditions = array( 'page_id' => $this->getId() );
@@ -804,13 +994,14 @@ class WikiPage extends Page {
                        $conditions['page_latest'] = $lastRevision;
                }
 
+               $now = wfTimestampNow();
                $dbw->update( 'page',
                        array( /* SET */
                                'page_latest'      => $revision->getId(),
-                               'page_touched'     => $dbw->timestamp(),
+                               '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__ );
@@ -818,6 +1009,12 @@ 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__ );
@@ -841,7 +1038,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;
                }
 
@@ -900,51 +1097,76 @@ class WikiPage extends Page {
                return $ret;
        }
 
+       /**
+        * 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
+     * @deprecated since 1.20: use ContentHandler::getUndoContent() instead.
+        */
+       public function getUndoText( Revision $undo, Revision $undoafter = null ) { #FIXME: replace usages.
+        $this->loadLastEdit();
+
+        if ( $this->mLastRevision ) {
+            $handler = ContentHandler::getForTitle( $this->getTitle() );
+            $undone = $handler->getUndoContent( $this->mLastRevision, $undo, $undoafter );
+
+            if ( !$undone ) {
+                return false;
+            } else {
+                return ContentHandler::getContentText( $undone );
+            }
+        }
+
+        return false;
+       }
+
        /**
         * @param $section empty/null/false or a section number (0, 1, 2, T1, T2...)
         * @param $text String: new text of the section
-        * @param $summary String: new section's subject, only if $section is 'new'
+        * @param $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
+        * @return Content new complete article content, or null if error
+     * @deprecated since 1.20: use Content::replaceSection () instead.
         */
-       public function replaceSection( $section, $text, $summary = '', $edittime = null ) {
+       public function replaceSection( $section, $text, $sectionTitle = '', $edittime = null ) { #FIXME: create a Content-based version (take and return Content object)
                wfProfileIn( __METHOD__ );
 
+        $sectionContent = ContentHandler::makeContent( $text, $this->getTitle() ); #XXX: could make section title, but that's not required.
+
                if ( strval( $section ) == '' ) {
                        // Whole-page edit; let the whole text through
+            $newContent = $sectionContent;
                } 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' ) {
+                               $oldContent = $this->getContent();
+                               if ( ! $oldContent ) {
+                                       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;
-                       }
-
-                       $oldtext = $rev->getText();
-
-                       if ( $section == 'new' ) {
-                               # Inserting a new section
-                               $subject = $summary ? wfMsgForContent( 'newsectionheaderdefaultlevel', $summary ) . "\n\n" : '';
-                               $text = strlen( trim( $oldtext ) ) > 0
-                                               ? "{$oldtext}\n\n{$subject}{$text}"
-                                               : "{$subject}{$text}";
-                       } else {
-                               # Replacing an existing section; roll out the big guns
-                               global $wgParser;
+                               if ( !$rev ) {
+                                       wfDebug( "WikiPage::replaceSection asked for bogus section (page: " .
+                                               $this->getId() . "; section: $section; edittime: $edittime)\n" );
+                                       wfProfileOut( __METHOD__ );
+                                       return null;
+                               }
 
-                               $text = $wgParser->replaceSection( $oldtext, $section, $text );
+                $oldContent = $rev->getContent();
                        }
+
+            $newContent = $oldContent->replaceSection( $section, $sectionContent, $sectionTitle );
                }
 
                wfProfileOut( __METHOD__ );
-               return $text;
+               return ContentHandler::getContentText( $newContent ); #XXX: unclear what will happen for non-wikitext!
        }
 
        /**
@@ -987,7 +1209,7 @@ class WikiPage extends Page {
         *          Fill in blank summaries with generated text where possible
         *
         * If neither EDIT_NEW nor EDIT_UPDATE is specified, the status of the article will be detected.
-        * If EDIT_UPDATE is specified and the article doesn't exist, the function will an
+        * If EDIT_UPDATE is specified and the article doesn't exist, the function will return an
         * edit-gone-missing error. If EDIT_NEW is specified and the article does exist, an
         * edit-already-exists error will be returned. These two conditions are also possible with
         * auto-detection due to MediaWiki's performance-optimised locking strategy.
@@ -1009,8 +1231,64 @@ class WikiPage extends Page {
         *     revision:                The revision object for the inserted revision, or null
         *
         *  Compatibility note: this function previously returned a boolean value indicating success/failure
-        */
-       public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
+     * @deprecated since 1.20: use doEditContent() instead.
+        */
+    public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) { #FIXME: use doEditContent() instead
+        #TODO: log use of deprecated function
+        $content = ContentHandler::makeContent( $text, $this->getTitle() );
+
+        return $this->doEditContent( $content, $summary, $flags, $baseRevId, $user );
+    }
+
+    /**
+     * Change an existing article or create a new article. Updates RC and all necessary caches,
+     * optionally via the deferred update array.
+     *
+     * @param $content Content: new content
+     * @param $summary String: edit summary
+     * @param $flags Integer bitfield:
+     *      EDIT_NEW
+     *          Article is known or assumed to be non-existent, create a new one
+     *      EDIT_UPDATE
+     *          Article is known or assumed to be pre-existing, update it
+     *      EDIT_MINOR
+     *          Mark this edit minor, if the user is allowed to do so
+     *      EDIT_SUPPRESS_RC
+     *          Do not log the change in recentchanges
+     *      EDIT_FORCE_BOT
+     *          Mark the edit a "bot" edit regardless of user rights
+     *      EDIT_DEFER_UPDATES
+     *          Defer some of the updates until the end of index.php
+     *      EDIT_AUTOSUMMARY
+     *          Fill in blank summaries with generated text where possible
+     *
+     * If neither EDIT_NEW nor EDIT_UPDATE is specified, the status of the article will be detected.
+     * If EDIT_UPDATE is specified and the article doesn't exist, the function will return an
+     * edit-gone-missing error. If EDIT_NEW is specified and the article does exist, an
+     * edit-already-exists error will be returned. These two conditions are also possible with
+     * auto-detection due to MediaWiki's performance-optimised locking strategy.
+     *
+     * @param $baseRevId the revision ID this edit was based off, if any
+     * @param $user User the user doing the edit
+     * @param $serialisation_format String: format for storing the content in the database
+     *
+     * @return Status object. Possible errors:
+     *     edit-hook-aborted:       The ArticleSave hook aborted the edit but didn't set the fatal flag of $status
+     *     edit-gone-missing:       In update mode, but the article didn't exist
+     *     edit-conflict:           In update mode, the article changed unexpectedly
+     *     edit-no-change:          Warning that the text was the same as before
+     *     edit-already-exists:     In creation mode, but the article already exists
+     *
+     *  Extensions may define additional errors.
+     *
+     *  $return->value will contain an associative array with members as follows:
+     *     new:                     Boolean indicating if the function attempted to create a new article
+     *     revision:                The revision object for the inserted revision, or null
+     *
+     *  Compatibility note: this function previously returned a boolean value indicating success/failure
+     */
+       public function doEditContent( Content $content, $summary, $flags = 0, $baseRevId = false,
+                                   User $user = null, $serialisation_format = null ) { #FIXME: use this
                global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries;
 
                # Low-level sanity check
@@ -1024,14 +1302,29 @@ class WikiPage extends Page {
                $status = Status::newGood( array() );
 
                # Load $this->mTitle->getArticleID() and $this->mLatest if it's not already
-               $this->loadPageData();
+               $this->loadPageData( 'fromdbmaster' );
 
                $flags = $this->checkFlags( $flags );
 
-               if ( !wfRunHooks( 'ArticleSave', array( &$this, &$user, &$text, &$summary,
-                       $flags & EDIT_MINOR, null, null, &$flags, &$status ) ) )
-               {
-                       wfDebug( __METHOD__ . ": ArticleSave hook aborted save!\n" );
+        # call legacy hook
+        $hook_ok = wfRunHooks( 'ArticleContentSave', array( &$this, &$user, &$content, &$summary, #FIXME: document new hook!
+            $flags & EDIT_MINOR, null, null, &$flags, &$status ) );
+
+        if ( $hook_ok && !empty( $wgHooks['ArticleSave'] ) ) { # avoid serialization overhead if the hook isn't present
+            $content_text = $content->serialize();
+            $txt = $content_text; # clone
+
+            $hook_ok = wfRunHooks( 'ArticleSave', array( &$this, &$user, &$txt, &$summary, #FIXME: deprecate legacy hook!
+                $flags & EDIT_MINOR, null, null, &$flags, &$status ) );
+
+            if ( $txt !== $content_text ) {
+                # if the text changed, unserialize the new version to create an updated Content object.
+                $content = $content->getContentHandler()->unserialize( $txt );
+            }
+        }
+
+               if ( !$hook_ok ) {
+                       wfDebug( __METHOD__ . ": ArticleSave or ArticleSaveContent hook aborted save!\n" );
 
                        if ( $status->isOK() ) {
                                $status->fatal( 'edit-hook-aborted' );
@@ -1045,18 +1338,24 @@ class WikiPage extends Page {
                $isminor = ( $flags & EDIT_MINOR ) && $user->isAllowed( 'minoredit' );
                $bot = $flags & EDIT_FORCE_BOT;
 
-               $oldtext = $this->getRawText(); // current revision
-               $oldsize = strlen( $oldtext );
+               $old_content = $this->getContent( Revision::RAW ); // current revision's content
+
+               $oldsize = $old_content ? $old_content->getSize() : 0;
+               $oldid = $this->getLatest();
+               $oldIsRedirect = $this->isRedirect();
                $oldcountable = $this->isCountable();
 
+        $handler = $content->getContentHandler();
+
                # Provide autosummaries if one is not provided and autosummaries are enabled.
                if ( $wgUseAutomaticEditSummaries && $flags & EDIT_AUTOSUMMARY && $summary == '' ) {
-                       $summary = $this->getAutosummary( $oldtext, $text, $flags );
+                       $summary = $handler->getAutosummary( $old_content, $content, $flags );
                }
 
-               $editInfo = $this->prepareTextForEdit( $text, null, $user );
-               $text = $editInfo->pst;
-               $newsize = strlen( $text );
+               $editInfo = $this->prepareContentForEdit( $content, null, $user, $serialisation_format );
+               $serialized = $editInfo->pst;
+        $content = $editInfo->pstContent;
+               $newsize =  $content->getSize();
 
                $dbw = wfGetDB( DB_MASTER );
                $now = wfTimestampNow();
@@ -1066,6 +1365,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 );
@@ -1075,25 +1383,17 @@ class WikiPage extends Page {
                                'page'       => $this->getId(),
                                'comment'    => $summary,
                                'minor_edit' => $isminor,
-                               'text'       => $text,
-                               'parent_id'  => $this->mLatest,
+                               'text'       => $serialized,
+                'len'        => $newsize,
+                               'parent_id'  => $oldid,
                                'user'       => $user->getId(),
                                'user_text'  => $user->getName(),
                                'timestamp'  => $now
                        ) );
 
-                       $changed = ( strcmp( $text, $oldtext ) != 0 );
+                       $changed = !$content->equals( $old_content );
 
                        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();
                                $revisionId = $revision->insertOn( $dbw );
 
@@ -1104,7 +1404,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!! */
@@ -1127,7 +1427,7 @@ 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
                                                );
 
@@ -1139,6 +1439,10 @@ class WikiPage extends Page {
                                        $user->incEditCount();
                                        $dbw->commit();
                                }
+                       } else {
+                               // Bug 32948: revision ID must be set to page {{REVISIONID}} and
+                               // related variables correctly
+                               $revision->setId( $this->getLatest() );
                        }
 
                        if ( !$wgDBtransactions ) {
@@ -1158,8 +1462,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();
@@ -1187,18 +1489,14 @@ class WikiPage extends Page {
                                'page'       => $newid,
                                'comment'    => $summary,
                                'minor_edit' => $isminor,
-                               'text'       => $text,
+                               'text'       => $serialized,
+                'len'        => $newsize,
                                'user'       => $user->getId(),
                                'user_text'  => $user->getName(),
                                'timestamp'  => $now
                        ) );
                        $revisionId = $revision->insertOn( $dbw );
 
-                       $this->mTitle->resetArticleID( $newid );
-                       # Update the LinkCache. Resetting the Title ArticleID means it will rely on having that already cached
-                       # @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 );
 
@@ -1213,7 +1511,7 @@ class WikiPage extends Page {
                                        $this->mTitle->getUserPermissionsErrors( 'autopatrol', $user ) );
                                # Add RC row to the DB
                                $rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot,
-                                       '', strlen( $text ), $revisionId, $patrolled );
+                                       '', $content->getSize(), $revisionId, $patrolled );
 
                                # Log auto-patrolled edits
                                if ( $patrolled ) {
@@ -1226,21 +1524,27 @@ class WikiPage extends Page {
                        # Update links, etc.
                        $this->doEditUpdates( $revision, $user, array( 'created' => true ) );
 
-                       wfRunHooks( 'ArticleInsertComplete', array( &$this, &$user, $text, $summary,
+                       wfRunHooks( 'ArticleInsertComplete', array( &$this, &$user, $serialized, $summary, #FIXME: deprecate legacy hook
                                $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
+
+            wfRunHooks( 'ArticleContentInsertComplete', array( &$this, &$user, $content, $summary, #FIXME: document new hook
+                $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
                }
 
                # Do updates right now unless deferral was requested
                if ( !( $flags & EDIT_DEFER_UPDATES ) ) {
-                       wfDoUpdates();
+                       DeferredUpdates::doUpdates();
                }
 
                // Return the new revision (or null) to the caller
                $status->value['revision'] = $revision;
 
-               wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $text, $summary,
+               wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $serialized, $summary,  #FIXME: deprecate legacy hook
                        $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ) );
 
+        wfRunHooks( 'ArticleContentSaveComplete', array( &$this, &$user, $content, $summary, #FIXME: document new hook
+            $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ) );
+
                # Promote user to any groups they meet the criteria for
                $user->addAutopromoteOnceGroups( 'onEdit' );
 
@@ -1249,297 +1553,486 @@ class WikiPage extends Page {
        }
 
        /**
-        * Update the article's restriction field, and leave a log entry.
-        *
-        * @param $limit Array: set of restriction keys
-        * @param $reason String
-        * @param &$cascade Integer. Set to false if cascading protection isn't allowed.
-        * @param $expiry Array: per restriction type expiration
-        * @param $user User The user updating the restrictions
-        * @return bool true on success
+        * Get parser options suitable for rendering the primary article wikitext
+        * @param User|string $user User object or 'canonical'
+        * @return ParserOptions
         */
-       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;
-               }
-
-               if ( wfReadOnly() ) {
-                       wfDebug( "updateRestrictions failed: read-only\n" );
-                       return false;
+       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;
+       }
 
-               if ( count( $this->mTitle->getUserPermissionsErrors( 'protect', $user ) ) ) {
-                       wfDebug( "updateRestrictions failed: insufficient permissions\n" );
-                       return false;
-               }
+       /**
+        * Prepare text which is about to be saved.
+        * Returns a stdclass with source, pst and output members
+     * @deprecated in 1.20: use prepareContentForEdit instead.
+        */
+    public function prepareTextForEdit( $text, $revid = null, User $user = null ) {  #FIXME: use prepareContentForEdit() instead #XXX: who uses this?!
+        #TODO: log use of deprecated function
+        $content = ContentHandler::makeContent( $text, $this->getTitle() );
+        return $this->prepareContentForEdit( $content, $revid , $user );
+    }
+
+    /**
+     * Prepare content which is about to be saved.
+     * Returns a stdclass with source, pst and output members
+     *
+     * @param \Content $content
+     * @param null $revid
+     * @param null|\User $user
+     * @param null $serialization_format
+     * @return bool|object
+     */
+       public function prepareContentForEdit( Content $content, $revid = null, User $user = null, $serialization_format = null ) { #FIXME: use this #XXX: really public?!
+               global $wgParser, $wgContLang, $wgUser;
+               $user = is_null( $user ) ? $wgUser : $user;
+               // @TODO fixme: check $user->getId() here???
 
-               if ( !$cascade ) {
-                       $cascade = false;
+               if ( $this->mPreparedEdit
+                       && $this->mPreparedEdit->newContent
+            && $this->mPreparedEdit->newContent->equals( $content )
+                       && $this->mPreparedEdit->revid == $revid
+            && $this->mPreparedEdit->format == $serialization_format
+            #XXX: also check $user here?
+               ) {
+                       // Already prepared
+                       return $this->mPreparedEdit;
                }
 
-               // Take this opportunity to purge out expired restrictions
-               Title::purgeExpiredRestrictions();
+               $popts = ParserOptions::newFromUserAndLang( $user, $wgContLang );
+               wfRunHooks( 'ArticlePrepareTextForEdit', array( $this, $popts ) );
 
-               # @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 );
-               $changed = false;
+               $edit = (object)array();
+               $edit->revid = $revid;
 
-               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] )
-                               {
-                                       $changed = true;
-                               }
-                       }
-               }
+               $edit->pstContent = $content->preSaveTransform( $this->mTitle, $user, $popts );
+        $edit->pst = $edit->pstContent->serialize( $serialization_format );
+        $edit->format = $serialization_format;
 
-               $current = self::flattenRestrictions( $current );
+               $edit->popts = $this->makeParserOptions( 'canonical' );
+               $edit->output = $edit->pstContent->getParserOutput( $this->mTitle, $revid, $edit->popts );
 
-               $changed = ( $changed || $current != $updated );
-               $changed = $changed || ( $updated && $this->mTitle->areRestrictionsCascading() != $cascade );
-               $protect = ( $updated != '' );
+        $edit->newContent = $content;
+               $edit->oldContent = $this->getContent( Revision::RAW );
 
-               # If nothing's changed, do nothing
-               if ( $changed ) {
-                       if ( wfRunHooks( 'ArticleProtect', array( &$this, &$user, $limit, $reason ) ) ) {
-                               $dbw = wfGetDB( DB_MASTER );
+        $edit->newText = ContentHandler::getContentText( $edit->newContent ); #FIXME: B/C only! don't use this field!
+        $edit->oldText = $edit->oldContent ? ContentHandler::getContentText( $edit->oldContent ) : ''; #FIXME: B/C only! don't use this field!
 
-                               # Prepare a null revision to be added to the history
-                               $modified = $current != '' && $protect;
+               $this->mPreparedEdit = $edit;
 
-                               if ( $protect ) {
-                                       $comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle';
-                               } else {
-                                       $comment_type = 'unprotectedarticle';
-                               }
+               return $edit;
+       }
 
-                               $comment = $wgContLang->ucfirst( wfMsgForContent( $comment_type, $this->mTitle->getPrefixedText() ) );
+       /**
+        * Do standard deferred updates after page edit.
+        * Update links tables, site stats, search index and message cache.
+        * Purges pages that include this page if the text was changed here.
+        * Every 100th edit, prune the recent changes table.
+        *
+        * @private
+        * @param $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;
 
-                               # 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' );
+               wfProfileIn( __METHOD__ );
 
-                               # The schema allows multiple restrictions
-                               if ( !in_array( 'protect', $editrestriction ) && !in_array( 'sysop', $editrestriction ) ) {
-                                       $cascade = false;
-                               }
+               $options += array( 'changed' => true, 'created' => false, 'oldcountable' => null );
+               $text = $revision->getText();
 
-                               $cascade_description = '';
+               # 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;
+               }
 
-                               if ( $cascade ) {
-                                       $cascade_description = ' [' . wfMsgForContent( 'protect-summary-cascade' ) . ']';
-                               }
+               # Save it to the parser cache
+               if ( $wgEnableParserCache ) {
+                       $parserCache = ParserCache::singleton();
+                       $parserCache->save( $editInfo->output, $this, $editInfo->popts );
+               }
 
-                               if ( $reason ) {
-                                       $comment .= ": $reason";
-                               }
+               # Update the links tables
+               $u = new LinksUpdate( $this->mTitle, $editInfo->output );
+               $u->doUpdate();
 
-                               $editComment = $comment;
-                               $encodedExpiry = array();
-                               $protect_description = '';
-                               foreach ( $limit as $action => $restrictions ) {
-                                       if ( !isset( $expiry[$action] ) )
-                                               $expiry[$action] = $dbw->getInfinity();
-
-                                       $encodedExpiry[$action] = $dbw->encodeExpiry( $expiry[$action] );
-                                       if ( $restrictions != '' ) {
-                                               $protect_description .= "[$action=$restrictions] (";
-                                               if ( $encodedExpiry[$action] != 'infinity' ) {
-                                                       $protect_description .= wfMsgForContent( 'protect-expiring',
-                                                               $wgContLang->timeanddate( $expiry[$action], false, false ) ,
-                                                               $wgContLang->date( $expiry[$action], false, false ) ,
-                                                               $wgContLang->time( $expiry[$action], false, false ) );
-                                               } else {
-                                                       $protect_description .= wfMsgForContent( 'protect-expiry-indefinite' );
-                                               }
+               wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $options['changed'] ) );
 
-                                               $protect_description .= ') ';
-                                       }
-                               }
-                               $protect_description = trim( $protect_description );
+               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;
 
-                               if ( $protect_description && $protect ) {
-                                       $editComment .= " ($protect_description)";
-                               }
+                               $dbw = wfGetDB( DB_MASTER );
+                               $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
+                               $dbw->delete(
+                                       'recentchanges',
+                                       array( "rc_timestamp < '$cutoff'" ),
+                                       __METHOD__
+                               );
+                       }
+               }
 
-                               if ( $cascade ) {
-                                       $editComment .= "$cascade_description";
-                               }
+               if ( !$this->mTitle->exists() ) {
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
 
-                               # 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__ );
-                                       }
-                               }
+               $id = $this->getId();
+               $title = $this->mTitle->getPrefixedDBkey();
+               $shortTitle = $this->mTitle->getDBkey();
 
-                               # 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__
-                               );
+               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;
+               }
 
-                               wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $nullRevision, $latest, $user ) );
-                               wfRunHooks( 'ArticleProtectComplete', array( &$this, &$user, $limit, $reason ) );
+               DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 1, $good, $total ) );
+               DeferredUpdates::addUpdate( new SearchUpdate( $id, $title, $text ) );
 
-                               # 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 );
+               # 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 {
-                                       $log->addEntry( 'unprotect', $this->mTitle, $reason );
+                                       wfDebug( __METHOD__ . ": don't need to notify a nonexistent user\n" );
                                }
-                       } # End hook
-               } # End "changed" check
-
-               return true;
-       }
-
-       /**
-        * Take an array of page restrictions and flatten it to a string
-        * suitable for insertion into the page_restrictions field.
-        * @param $limit Array
-        * @return String
-        */
-       protected static function flattenRestrictions( $limit ) {
-               if ( !is_array( $limit ) ) {
-                       throw new MWException( 'WikiPage::flattenRestrictions given non-array restriction set' );
+                       }
                }
 
-               $bits = array();
-               ksort( $limit );
+               if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+                       MessageCache::singleton()->replace( $shortTitle, $text );
+               }
 
-               foreach ( $limit as $action => $restrictions ) {
-                       if ( $restrictions != '' ) {
-                               $bits[] = "$action=$restrictions";
-                       }
+               if( $options['created'] ) {
+                       self::onArticleCreate( $this->mTitle );
+               } else {
+                       self::onArticleEdit( $this->mTitle );
                }
 
-               return implode( ':', $bits );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
-        * @return bool whether or not the page surpasses $wgDeleteRevisionsLimit revisions
+        * 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 isBigDeletion() {
-               global $wgDeleteRevisionsLimit;
+    public function doQuickEdit( $text, User $user, $comment = '', $minor = 0 ) {
+        #TODO: log use of deprecated function
+        $content = ContentHandler::makeContent( $text, $this->getTitle() );
+        return $this->doQuickEdit( $content, $user, $comment , $minor );
+    }
+
+    /**
+     * 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 $content Content: content submitted
+     * @param $user User The relevant user
+     * @param $comment String: comment submitted
+     * @param $serialisation_format String: format for storing the content in the database
+     * @param $minor Boolean: whereas it's a minor modification
+     */
+       public function doQuickEditContent( Content $content, User $user, $comment = '', $minor = 0, $serialisation_format = null ) {
+               wfProfileIn( __METHOD__ );
 
-               if ( $wgDeleteRevisionsLimit ) {
-                       $revCount = $this->estimateRevisionCount();
+        $serialized = $content->serialize( $serialisation_format );
 
-                       return $revCount > $wgDeleteRevisionsLimit;
-               }
+               $dbw = wfGetDB( DB_MASTER );
+               $revision = new Revision( array(
+                       'page'       => $this->getId(),
+                       'text'       => $serialized,
+            'length'     => $content->getSize(),
+                       'comment'    => $comment,
+                       'minor_edit' => $minor ? 1 : 0,
+               ) );
+               $revision->insertOn( $dbw );
+               $this->updateRevisionOn( $dbw, $revision );
 
-               return false;
+               wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $user ) );
+
+               wfProfileOut( __METHOD__ );
        }
 
        /**
-        * @return int approximate revision count
+        * Update the article's restriction field, and leave a log entry.
+        * This works for protection both existing and non-existing pages.
+        *
+        * @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 estimateRevisionCount() {
-               $dbr = wfGetDB( DB_SLAVE );
+       public function doUpdateRestrictions( array $limit, array $expiry, &$cascade, $reason, User $user ) {
+               global $wgContLang;
 
-               // For an exact count...
-               // return $dbr->selectField( 'revision', 'COUNT(*)',
-               //      array( 'rev_page' => $this->getId() ), __METHOD__ );
-               return $dbr->estimateRowCount( 'revision', '*',
-                       array( 'rev_page' => $this->getId() ), __METHOD__ );
-       }
+               if ( wfReadOnly() ) {
+                       return Status::newFatal( 'readonlytext', wfReadOnlyReason() );
+               }
 
-       /**
-        * 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 );
+               $restrictionTypes = $this->mTitle->getRestrictionTypes();
 
-               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
-                               )
-                       );
+               $id = $this->mTitle->getArticleID();
 
-                       if ( !$res ) {
-                               wfProfileOut( __METHOD__ );
-                               return array();
+               if ( !$cascade ) {
+                       $cascade = false;
+               }
+
+               // Take this opportunity to purge out expired restrictions
+               Title::purgeExpiredRestrictions();
+
+               # @todo FIXME: Same limitations as described in ProtectionForm.php (line 37);
+               # we expect a single selection, but the schema allows otherwise.
+               $isProtected = false;
+               $protect = false;
+               $changed = false;
+
+               $dbw = wfGetDB( DB_MASTER );
+
+               foreach ( $restrictionTypes as $action ) {
+                       if ( !isset( $expiry[$action] ) ) {
+                               $expiry[$action] = $dbw->getInfinity();
+                       }
+                       if ( !isset( $limit[$action] ) ) {
+                               $limit[$action] = '';
+                       } elseif ( $limit[$action] != '' ) {
+                               $protect = true;
                        }
 
-                       $row = $db->fetchObject( $res );
+                       # Get current restrictions on $action
+                       $current = implode( '', $this->mTitle->getRestrictions( $action ) );
+                       if ( $current != '' ) {
+                               $isProtected = true;
+                       }
 
-                       if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
-                               $db = wfGetDB( DB_MASTER );
-                               $continue--;
+                       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;
+                               }
+                       }
+               }
+
+               if ( !$changed && $protect && $this->mTitle->areRestrictionsCascading() != $cascade ) {
+                       $changed = true;
+               }
+
+               # If nothing's changed, do nothing
+               if ( !$changed ) {
+                       return Status::newGood();
+               }
+
+               if ( !$protect ) { # No protection at all means unprotection
+                       $revCommentMsg = 'unprotectedarticle';
+                       $logAction = 'unprotect';
+               } elseif ( $isProtected ) {
+                       $revCommentMsg = 'modifiedarticleprotection';
+                       $logAction = 'modify';
+               } else {
+                       $revCommentMsg = 'protectedarticle';
+                       $logAction = 'protect';
+               }
+
+               $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 {
+                                       $protectDescription .= wfMsgForContent( 'protect-expiry-indefinite' );
+                               }
+
+                               $protectDescription .= ') ';
+                       }
+               }
+               $protectDescription = trim( $protectDescription );
+
+               if ( $id ) { # Protection of existing page
+                       if ( !wfRunHooks( 'ArticleProtect', array( &$this, &$user, $limit, $reason ) ) ) {
+                               return Status::newGood();
+                       }
+
+                       # 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;
+                       }
+
+                       # 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__ );
+                               }
+                       }
+
+                       # 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' ) . ']';
+                       }
+
+                       # 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__
+                       );
+
+                       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;
+
+                       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 {
-                               $continue = 0;
+                               $dbw->delete( 'protected_titles',
+                                       array(
+                                               'pt_namespace' => $this->mTitle->getNamespace(),
+                                               'pt_title' => $this->mTitle->getDBkey()
+                                       ), __METHOD__
+                               );
                        }
-               } while ( $continue );
+               }
 
-               $authors = array( $row->rev_user_text );
+               $this->mTitle->flushRestrictions();
 
-               foreach ( $res as $row ) {
-                       $authors[] = $row->rev_user_text;
+               if ( $logAction == 'unprotect' ) {
+                       $logParams = array();
+               } else {
+                       $logParams = array( $protectDescription, $cascade ? 'cascade' : '' );
                }
 
-               wfProfileOut( __METHOD__ );
-               return $authors;
+               # Update the protection log
+               $log = new LogPage( 'protect' );
+               $log->addEntry( $logAction, $this->mTitle, trim( $reason ), $logParams, $user );
+
+               return Status::newGood();
+       }
+
+       /**
+        * Take an array of page restrictions and flatten it to a string
+        * suitable for insertion into the page_restrictions field.
+        * @param $limit Array
+        * @return String
+        */
+       protected static function flattenRestrictions( $limit ) {
+               if ( !is_array( $limit ) ) {
+                       throw new MWException( 'WikiPage::flattenRestrictions given non-array restriction set' );
+               }
+
+               $bits = array();
+               ksort( $limit );
+
+               foreach ( $limit as $action => $restrictions ) {
+                       if ( $restrictions != '' ) {
+                               $bits[] = "$action=$restrictions";
+                       }
+               }
+
+               return implode( ':', $bits );
        }
 
        /**
@@ -1547,7 +2040,7 @@ 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 bitfield
         *      Revision::DELETED_TEXT
         *      Revision::DELETED_COMMENT
         *      Revision::DELETED_USER
@@ -1561,7 +2054,7 @@ class WikiPage extends Page {
        public function doDeleteArticle(
                $reason, $suppress = false, $id = 0, $commit = true, &$error = '', User $user = null
        ) {
-               global $wgDeferredUpdateList, $wgUseTrackbacks, $wgUser;
+               global $wgUser;
                $user = is_null( $user ) ? $wgUser : $user;
 
                wfDebug( __METHOD__ . "\n" );
@@ -1577,9 +2070,6 @@ class WikiPage extends Page {
                        return false;
                }
 
-               $u = new SiteStatsUpdate( 0, 1, - (int)$this->isCountable(), -1 );
-               array_push( $wgDeferredUpdateList, $u );
-
                // Bitfields to further suppress the content
                if ( $suppress ) {
                        $bitfield = 0;
@@ -1613,21 +2103,22 @@ class WikiPage extends Page {
                                'ar_timestamp'  => 'rev_timestamp',
                                'ar_minor_edit' => 'rev_minor_edit',
                                'ar_rev_id'     => 'rev_id',
+                               'ar_parent_id'  => 'rev_parent_id',
                                'ar_text_id'    => 'rev_text_id',
                                'ar_text'       => '\'\'', // Be explicit to appease
                                'ar_flags'      => '\'\'', // MySQL's "strict mode"...
                                'ar_len'        => 'rev_len',
                                'ar_page_id'    => 'page_id',
-                               'ar_deleted'    => $bitfield
+                               'ar_deleted'    => $bitfield,
+                               'ar_sha1'       => 'rev_content_model',
+                               'ar_content_format'       => 'rev_content_format',
+                               'ar_content_format'       => 'rev_sha1'
                        ), array(
                                'page_id' => $id,
                                'page_id = rev_page'
                        ), __METHOD__
                );
 
-               # Delete restrictions for it
-               $dbw->delete( 'page_restrictions', array ( 'pr_page' => $id ), __METHOD__ );
-
                # Now that it's safely backed up, delete it
                $dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__ );
                $ok = ( $dbw->affectedRows() > 0 ); // getArticleId() uses slave, could be laggy
@@ -1637,6 +2128,39 @@ class WikiPage extends Page {
                        return false;
                }
 
+               $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();
+               }
+
+               wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$user, $reason, $id ) );
+               return true;
+       }
+
+       /**
+        * 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__ );
@@ -1651,18 +2175,16 @@ 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 ) );
-                       $dbw->delete( 'imagelinks', array( 'il_from' => $id ) );
-                       $dbw->delete( 'categorylinks', array( 'cl_from' => $id ) );
-                       $dbw->delete( 'templatelinks', array( 'tl_from' => $id ) );
-                       $dbw->delete( 'externallinks', array( 'el_from' => $id ) );
-                       $dbw->delete( 'langlinks', array( 'll_from' => $id ) );
-                       $dbw->delete( 'iwlinks', array( 'iwl_from' => $id ) );
-                       $dbw->delete( 'redirect', array( 'rd_from' => $id ) );
+                       $dbw->delete( 'pagelinks', array( 'pl_from' => $id ), __METHOD__ );
+                       $dbw->delete( 'imagelinks', array( 'il_from' => $id ), __METHOD__ );
+                       $dbw->delete( 'categorylinks', array( 'cl_from' => $id ), __METHOD__ );
+                       $dbw->delete( 'templatelinks', array( 'tl_from' => $id ), __METHOD__ );
+                       $dbw->delete( 'externallinks', array( 'el_from' => $id ), __METHOD__ );
+                       $dbw->delete( 'langlinks', array( 'll_from' => $id ), __METHOD__ );
+                       $dbw->delete( 'iwlinks', array( 'iwl_from' => $id ), __METHOD__ );
+                       $dbw->delete( 'redirect', array( 'rd_from' => $id ), __METHOD__ );
+                       $dbw->delete( 'page_props', array( 'pp_page' => $id ), __METHOD__ );
                }
 
                # If using cleanup triggers, we can skip some manual deletes
@@ -1683,20 +2205,6 @@ class WikiPage extends Page {
 
                # Clear the cached article id so the interface doesn't act like we exist
                $this->mTitle->resetArticleID( 0 );
-
-               # Log the deletion, if the page was suppressed, log it at Oversight instead
-               $logtype = $suppress ? 'suppress' : 'delete';
-               $log = new LogPage( $logtype );
-
-               # Make sure logging got through
-               $log->addEntry( 'delete', $this->mTitle, $reason, array() );
-
-               if ( $commit ) {
-                       $dbw->commit();
-               }
-
-               wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$user, $reason, $id ) );
-               return true;
        }
 
        /**
@@ -1705,6 +2213,8 @@ class WikiPage extends Page {
         * roll back to, e.g. user is the sole contributor. This function
         * performs permissions checks on $user, then calls commitRollback()
         * to do the dirty work
+        * 
+        * @todo: seperate the business/permission stuff out from backend code
         *
         * @param $fromP String: Name of the user whose edits to rollback.
         * @param $summary String: Custom summary. Set to default summary if empty.
@@ -1752,7 +2262,7 @@ class WikiPage extends Page {
         * and return value documentation
         *
         * NOTE: This function does NOT check ANY permissions, it just commits the
-        * rollback to the DB Therefore, you should only call this function direct-
+        * rollback to the DB. Therefore, you should only call this function direct-
         * ly if you want to use custom permissions checks. If you don't, use
         * doRollback() instead.
         * @param $fromP String: Name of the user whose edits to rollback.
@@ -1861,298 +2371,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 $wgDeferredUpdateList, $wgDisableCounters;
-               if ( wfReadOnly() ) {
-                       return;
-               }
-
-               # Don't update page view counters on views from bot users (bug 14044)
-               if ( !$wgDisableCounters && !$user->isAllowed( 'bot' ) && $this->getId() ) {
-                       $wgDeferredUpdateList[] = new ViewCountUpdate( $this->getId() );
-                       $wgDeferredUpdateList[] = 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, $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::newFromUser( $user );
-               wfRunHooks( 'ArticlePrepareTextForEdit', array( $this, $popts ) );
-
-               $edit = (object)array();
-               $edit->revid = $revid;
-               $edit->newText = $text;
-               $edit->pst = $this->preSaveTransform( $text, $user, $popts );
-               $edit->popts = $this->getParserOptions( true );
-               $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 $wgDeferredUpdateList, $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;
-               }
-
-               $wgDeferredUpdateList[] = new SiteStatsUpdate( 0, 1, $good, $total );
-               $wgDeferredUpdateList[] = 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.19, 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__ );
+                       $revId = $status->value['revision']->getId();
+               } else {
+                       $revId = false;
+               }
 
-               $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();
        }
 
        /**
@@ -2218,7 +2453,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
@@ -2232,13 +2469,12 @@ class WikiPage extends Page {
         * @todo:  verify that $title is always a Title object (and never false or null), add Title hint to parameter $title
         */
        public static function onArticleEdit( $title ) {
-               global $wgDeferredUpdateList;
-
                // Invalidate caches of articles which include this page
-               $wgDeferredUpdateList[] = new HTMLCacheUpdate( $title, 'templatelinks' );
+               DeferredUpdates::addHTMLCacheUpdate( $title, 'templatelinks' );
+
 
                // Invalidate the caches of all pages which redirect here
-               $wgDeferredUpdateList[] = new HTMLCacheUpdate( $title, 'redirect' );
+               DeferredUpdates::addHTMLCacheUpdate( $title, 'redirect' );
 
                # Purge squid for this page only
                $title->purgeSquid();
@@ -2249,35 +2485,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.
@@ -2314,89 +2521,31 @@ class WikiPage extends Page {
        * @param $newtext String: The submitted text of the page.
        * @param $flags Int bitmask: a bitmask of flags submitted for the edit.
        * @return string An appropriate autosummary, or an empty string.
+    * @deprecated since 1.20, use ContentHandler::getAutosummary() instead
        */
        public static function getAutosummary( $oldtext, $newtext, $flags ) {
-               global $wgContLang;
-
-               # Decide what kind of autosummary is needed.
-
-               # Redirect autosummaries
-               $ot = Title::newFromRedirect( $oldtext );
-               $rt = Title::newFromRedirect( $newtext );
-
-               if ( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) {
-                       $truncatedtext = $wgContLang->truncate(
-                               str_replace( "\n", ' ', $newtext ),
-                               max( 0, 250
-                                       - strlen( wfMsgForContent( 'autoredircomment' ) )
-                                       - strlen( $rt->getFullText() )
-                               ) );
-                       return wfMsgForContent( 'autoredircomment', $rt->getFullText(), $truncatedtext );
-               }
-
-               # New page autosummaries
-               if ( $flags & EDIT_NEW && strlen( $newtext ) ) {
-                       # If they're making a new article, give its text, truncated, in the summary.
-
-                       $truncatedtext = $wgContLang->truncate(
-                               str_replace( "\n", ' ', $newtext ),
-                               max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new' ) ) ) );
-
-                       return wfMsgForContent( 'autosumm-new', $truncatedtext );
-               }
-
-               # Blanking autosummaries
-               if ( $oldtext != '' && $newtext == '' ) {
-                       return wfMsgForContent( 'autosumm-blank' );
-               } elseif ( strlen( $oldtext ) > 10 * strlen( $newtext ) && strlen( $newtext ) < 500 ) {
-                       # Removing more than 90% of the article
-
-                       $truncatedtext = $wgContLang->truncate(
-                               $newtext,
-                               max( 0, 200 - strlen( wfMsgForContent( 'autosumm-replace' ) ) ) );
+               # NOTE: stub for backwards-compatibility. assumes the given text is wikitext. will break horribly if it isn't.
 
-                       return wfMsgForContent( 'autosumm-replace', $truncatedtext );
-               }
+        $handler = ContentHandler::getForModelName( CONTENT_MODEL_WIKITEXT );
+        $oldContent = $handler->unserialize( $oldtext );
+        $newContent = $handler->unserialize( $newtext );
 
-               # If we reach this point, there's no applicable autosummary for our case, so our
-               # autosummary is empty.
-               return '';
+        return $handler->getAutosummary( $oldContent, $newContent, $flags );
        }
 
        /**
-        * Get parser options suitable for rendering the primary article wikitext
-        * @param $canonical boolean Determines that the generated options must not depend on user preferences (see bug 14404)
-        * @return mixed ParserOptions object or boolean false
+        * Auto-generates a deletion reason
+        *
+        * @param &$hasHistory Boolean: whether the page has a history
+        * @return mixed String containing deletion reason or empty string, or boolean false
+        *    if no revision occurred
+     * @deprecated since 1.20, use ContentHandler::getAutoDeleteReason() instead
         */
-       public function getParserOptions( $canonical = false ) {
-               global $wgUser, $wgLanguageCode;
-
-               if ( !$this->mParserOptions || $canonical ) {
-                       $user = !$canonical ? $wgUser : new User;
-                       $parserOptions = new ParserOptions( $user );
-                       $parserOptions->setTidy( true );
-                       $parserOptions->enableLimitReport();
-
-                       if ( $canonical ) {
-                               $parserOptions->setUserLang( $wgLanguageCode ); # Must be set explicitely
-                               return $parserOptions;
-                       }
-                       $this->mParserOptions = $parserOptions;
-               }
-               // Clone to allow modifications of the return value without affecting cache
-               return clone $this->mParserOptions;
-       }
+       public function getAutoDeleteReason( &$hasHistory ) {
+        #NOTE: stub for backwards-compatibility.
 
-       /**
-       * Get parser options suitable for rendering the primary article wikitext
-       * @param User $user
-       * @return ParserOptions
-       */
-       public function makeParserOptions( User $user ) {
-               $options = ParserOptions::newFromUser( $user );
-               $options->enableLimitReport(); // show inclusion/loop reports
-               $options->setTidy( true ); // fix bad HTML
-               return $options;
+               $handler = ContentHandler::getForTitle( $this->getTitle() );
+        $handler->getAutoDeleteReason( $this->getTitle(), $hasHistory );
        }
 
        /**
@@ -2466,7 +2615,7 @@ class WikiPage extends Page {
         * Updates cascading protections
         *
         * @param $parserOutput ParserOutput object for the current version
-        **/
+        */
        public function doCascadeProtectionUpdates( ParserOutput $parserOutput ) {
                if ( wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) {
                        return;
@@ -2513,27 +2662,310 @@ class WikiPage extends Page {
                }
        }
 
-       /*
-       * @deprecated since 1.19
-       */
+       /**
+        * 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 );
        }
 
-       /*
-       * @deprecated since 1.19
-       */
+       /**
+        * @deprecated since 1.18
+        */
        public function viewUpdates() {
+               wfDeprecated( __METHOD__, '1.18' );
                global $wgUser;
                return $this->doViewUpdates( $wgUser );
        }
 
-       /*
-       * @deprecated since 1.19
-       */
+       /**
+        * @deprecated since 1.18
+        */
        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|false
+        */
+       private $parserOutput = false;
+
+       /**
+        * @var bool
+        */
+       private $isDirty = false;
+
+       /**
+        * @var Status|false
+        */
+       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 $content Content|String: content to parse or null to load it; may also be given as a wikitext string, for BC
+        */
+       function __construct( Page $page, ParserOptions $parserOptions, $revid, $useParserCache, $content = null ) {
+        if ( is_string($content) ) { #BC: old style call
+            $modelName = $page->getRevision()->getContentModelName();
+            $format = $page->getRevision()->getContentFormat();
+            $content = ContentHandler::makeContent( $content, $page->getTitle(), $modelName, $format );
+        }
+
+               $this->page = $page;
+               $this->revid = $revid;
+               $this->cacheable = $useParserCache;
+               $this->parserOptions = $parserOptions;
+               $this->content = $content;
+               $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|false
+        */
+       public function getError() {
+               return $this->error;
+       }
+
+       /**
+        * @return bool
+        */
+       function doWork() {
+               global $wgParser, $wgUseFileCache;
+
+               $isCurrent = $this->revid === $this->page->getLatest();
+
+               if ( $this->content !== null ) {
+                       $content = $this->content;
+               } elseif ( $isCurrent ) {
+            $content = $this->page->getContent( Revision::RAW ); #XXX: why use RAW audience here, and PUBLIC (default) below?
+               } else {
+                       $rev = Revision::newFromTitle( $this->page->getTitle(), $this->revid );
+                       if ( $rev === null ) {
+                               return false;
+                       }
+            $content = $rev->getContent(); #XXX: why use PUBLIC audience here (default), and RAW above?
+               }
+
+               $time = - wfTime();
+               $this->parserOutput = $content->getParserOutput( $this->page->getTitle(), $this->revid, $this->parserOptions );
+               $time += wfTime();
+
+               # 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
+        */
+       function error( $status ) {
+               $this->error = $status;
+               return false;
        }
 }