Made getUndoText() not use unreliable getContent() function (weird wgRequest dependency)
[lhc/web/wiklou.git] / includes / Article.php
index d405cca..0999bdb 100644 (file)
@@ -11,6 +11,7 @@
  * Note: edit user interface and cache support functions have been
  * moved to separate EditPage and HTMLFileCache classes.
  *
+ * @internal documentation reviewed 15 Mar 2010
  */
 class Article {
        /**@{{
@@ -33,15 +34,15 @@ class Article {
        var $mRedirectTarget = null;      // !< Title object if set
        var $mRedirectUrl = false;        // !<
        var $mRevIdFetched = 0;           // !<
-       var $mRevision;                   // !<
+       var $mRevision;                   // !< Revision object if set
        var $mTimestamp = '';             // !<
-       var $mTitle;                      // !<
+       var $mTitle;                      // !< Title object
        var $mTotalAdjustment = 0;        // !<
        var $mTouched = '19700101000000'; // !<
        var $mUser = -1;                  // !< Not loaded
-       var $mUserText = '';              // !<
-       var $mParserOptions;              // !<
-       var $mParserOutput;               // !<
+       var $mUserText = '';              // !< username from Revision if set
+       var $mParserOptions;              // !< ParserOptions object
+       var $mParserOutput;               // !< ParserCache object if set
        /**@}}*/
 
        /**
@@ -50,12 +51,13 @@ class Article {
         * @param $oldId Integer revision ID, null to fetch from request, zero for current
         */
        public function __construct( Title $title, $oldId = null ) {
+               // FIXME: does the reference play any role here?
                $this->mTitle =& $title;
                $this->mOldId = $oldId;
        }
 
        /**
-        * Constructor from an article article
+        * Constructor from an page id
         * @param $id The article ID to load
         */
        public static function newFromID( $id ) {
@@ -70,7 +72,7 @@ class Article {
         * from another page on the wiki.
         * @param $from Title object.
         */
-       public function setRedirectedFrom( $from ) {
+       public function setRedirectedFrom( Title $from ) {
                $this->mRedirectedFrom = $from;
        }
 
@@ -82,20 +84,29 @@ class Article {
         * @return mixed Title object, or null if this page is not a redirect
         */
        public function getRedirectTarget() {
-               if ( !$this->mTitle || !$this->mTitle->isRedirect() )
+               if ( !$this->mTitle->isRedirect() ) {
                        return null;
-               if ( !is_null( $this->mRedirectTarget ) )
+               }
+
+               if ( $this->mRedirectTarget !== null ) {
                        return $this->mRedirectTarget;
+               }
+
                # Query the redirect table
                $dbr = wfGetDB( DB_SLAVE );
                $row = $dbr->selectRow( 'redirect',
-                       array( 'rd_namespace', 'rd_title' ),
+                       array( 'rd_namespace', 'rd_title', 'rd_fragment', 'rd_interwiki' ),
                        array( 'rd_from' => $this->getID() ),
                        __METHOD__
                );
-               if ( $row ) {
-                       return $this->mRedirectTarget = Title::makeTitle( $row->rd_namespace, $row->rd_title );
+
+               // 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();
        }
@@ -104,43 +115,66 @@ class Article {
         * 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
+        * @return Title object or null if not a redirect
         */
        public function insertRedirect() {
-               $retval = Title::newFromRedirect( $this->getContent() );
+               // recurse through to only get the final target
+               $retval = Title::newFromRedirectRecurse( $this->getContent() );
                if ( !$retval ) {
                        return null;
                }
+               $this->insertRedirectEntry( $retval );
+               return $retval;
+       }
+       
+       /**
+        * Insert or update the redirect table entry for this page to indicate
+        * it redirects to $rt .
+        * @param $rt Title redirect target
+        */
+       public function insertRedirectEntry( $rt ) {
                $dbw = wfGetDB( DB_MASTER );
                $dbw->replace( 'redirect', array( 'rd_from' ),
                        array(
                                'rd_from' => $this->getID(),
-                               'rd_namespace' => $retval->getNamespace(),
-                               'rd_title' => $retval->getDBkey()
+                               'rd_namespace' => $rt->getNamespace(),
+                               'rd_title' => $rt->getDBkey(),
+                               'rd_fragment' => $rt->getFragment(),
+                               'rd_interwiki' => $rt->getInterwiki(),
                        ),
                        __METHOD__
                );
-               return $retval;
        }
 
        /**
-        * Get the Title object this page redirects to
+        * 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() {
-               $text = $this->getContent();
-               return $this->followRedirectText( $text );
+               return $this->getRedirectURL( $this->getRedirectTarget() );
        }
 
        /**
         * Get the Title object this text redirects to
         *
+        * @param $text string article content containing redirect info
         * @return mixed false, Title of in-wiki target, or string with URL
+        * @deprecated
         */
        public function followRedirectText( $text ) {
-               $rt = Title::newFromRedirectRecurse( $text ); // recurse through to only get the final target
-               # process if title object is valid and not special:userlogout
+               // recurse through to only get the final target
+               return $this->getRedirectURL( Title::newFromRedirectRecurse( $text ) );
+       }
+       
+       /**
+        * Get the Title object or URL to use for a redirect. We use Title
+        * objects for same-wiki, non-special redirects and URLs for everything
+        * else.
+        * @param $rt Title Redirect target
+        * @return mixed false, Title object of local target, or string with URL
+        */
+       public function getRedirectURL( $rt ) {
                if ( $rt ) {
                        if ( $rt->getInterwiki() != '' ) {
                                if ( $rt->isLocal() ) {
@@ -164,15 +198,18 @@ class Article {
                                                return $rt->getFullURL();
                                        }
                                }
+
                                return $rt;
                        }
                }
+
                // No or invalid redirect
                return false;
        }
 
        /**
-        * get the title object of the article
+        * Get the title object of the article
+        * @return Title object of this page
         */
        public function getTitle() {
                return $this->mTitle;
@@ -180,6 +217,7 @@ class Article {
 
        /**
         * Clear the object
+        * FIXME: shouldn't this be public?
         * @private
         */
        public function clear() {
@@ -204,31 +242,38 @@ class Article {
        /**
         * Note that getContent/loadContent do not follow redirects anymore.
         * If you need to fetch redirectable content easily, try
-        * the shortcut in Article::followContent()
+        * the shortcut in Article::followRedirect()
+        *
+        * This function has side effects! Do not use this function if you
+        * only want the real revision text if any.
         *
         * @return Return the text of this revision
         */
        public function getContent() {
-               global $wgUser, $wgContLang, $wgOut, $wgMessageCache;
+               global $wgUser, $wgContLang, $wgMessageCache;
+
                wfProfileIn( __METHOD__ );
+
                if ( $this->getID() === 0 ) {
                        # If this is a MediaWiki:x message, then load the messages
                        # and return the message value for x.
                        if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
                                # If this is a system message, get the default text.
                                list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) );
-                               $wgMessageCache->loadAllMessages( $lang );
                                $text = wfMsgGetKey( $message, false, $lang, false );
+
                                if ( wfEmptyMsg( $message, $text ) )
                                        $text = '';
                        } else {
                                $text = wfMsgExt( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon', 'parsemag' );
                        }
                        wfProfileOut( __METHOD__ );
+
                        return $text;
                } else {
                        $this->loadContent();
                        wfProfileOut( __METHOD__ );
+
                        return $this->mContent;
                }
        }
@@ -243,8 +288,10 @@ class Article {
                if ( $this->mContentLoaded && $this->mOldId == 0 ) {
                        return $this->mContent;
                }
+
                $rev = Revision::newFromTitle( $this->mTitle );
                $text = $rev ? $rev->getRawText() : false;
+
                return $text;
        }
 
@@ -274,16 +321,25 @@ class Article {
         * @return mixed string on success, false on failure
         */
        public function getUndoText( Revision $undo, Revision $undoafter = null ) {
+               $currentRev = Revision::newFromTitle( $this->mTitle );
+               if ( !$currentRev ) {
+                       return false; // no page
+               }
                $undo_text = $undo->getText();
                $undoafter_text = $undoafter->getText();
-               $cur_text = $this->getContent();
+               $cur_text = $currentRev->getText();
+
                if ( $cur_text == $undo_text ) {
                        # No use doing a merge if it's just a straight revert.
                        return $undoafter_text;
                }
+
                $undone_text = '';
-               if ( !wfMerge( $undo_text, $undoafter_text, $cur_text, $undone_text ) )
+
+               if ( !wfMerge( $undo_text, $undoafter_text, $cur_text, $undone_text ) ) {
                        return false;
+               }
+
                return $undone_text;
        }
 
@@ -295,6 +351,7 @@ class Article {
                if ( is_null( $this->mOldId ) ) {
                        $this->mOldId = $this->getOldIDFromRequest();
                }
+
                return $this->mOldId;
        }
 
@@ -305,13 +362,16 @@ class Article {
         */
        public function getOldIDFromRequest() {
                global $wgRequest;
+
                $this->mRedirectUrl = false;
+
                $oldid = $wgRequest->getVal( 'oldid' );
+
                if ( isset( $oldid ) ) {
                        $oldid = intval( $oldid );
                        if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
                                $nextid = $this->mTitle->getNextRevisionID( $oldid );
-                               if ( $nextid  ) {
+                               if ( $nextid ) {
                                        $oldid = $nextid;
                                } else {
                                        $this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' );
@@ -323,9 +383,11 @@ class Article {
                                }
                        }
                }
+
                if ( !$oldid ) {
                        $oldid = 0;
                }
+
                return $oldid;
        }
 
@@ -333,22 +395,24 @@ class Article {
         * Load the revision (including text) into this object
         */
        function loadContent() {
-               if ( $this->mContentLoaded ) return;
+               if ( $this->mContentLoaded ) {
+                       return;
+               }
+
                wfProfileIn( __METHOD__ );
-               # Query variables :P
+
                $oldid = $this->getOldID();
-               # Pre-fill content with error message so that if something
-               # fails we'll have something telling us what we intended.
                $this->mOldId = $oldid;
                $this->fetchContent( $oldid );
+
                wfProfileOut( __METHOD__ );
        }
 
-
        /**
         * Fetch a page record with the given conditions
         * @param $dbr Database object
         * @param $conditions Array
+        * @return mixed Database result resource, or false on failure
         */
        protected function pageData( $dbr, $conditions ) {
                $fields = array(
@@ -364,20 +428,23 @@ class Article {
                                'page_latest',
                                'page_len',
                );
+
                wfRunHooks( 'ArticlePageDataBefore', array( &$this, &$fields ) );
-               $row = $dbr->selectRow(
-                       'page',
-                       $fields,
-                       $conditions,
-                       __METHOD__
-               );
+
+               $row = $dbr->selectRow( 'page', $fields, $conditions, __METHOD__ );
+
                wfRunHooks( 'ArticlePageDataAfter', array( &$this, &$row ) );
-               return $row ;
+
+               return $row;
        }
 
        /**
+        * Fetch a page record matching the Title object's namespace and title
+        * using a sanitized title string
+        *
         * @param $dbr Database object
         * @param $title Title object
+        * @return mixed Database result resource, or false on failure
         */
        public function pageDataFromTitle( $dbr, $title ) {
                return $this->pageData( $dbr, array(
@@ -386,6 +453,8 @@ class Article {
        }
 
        /**
+        * Fetch a page record matching the requested ID
+        *
         * @param $dbr Database
         * @param $id Integer
         */
@@ -406,8 +475,9 @@ class Article {
                }
 
                $lc = LinkCache::singleton();
+
                if ( $data ) {
-                       $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect );
+                       $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect, $data->page_latest );
 
                        $this->mTitle->mArticleID = intval( $data->page_id );
 
@@ -419,20 +489,19 @@ class Article {
                        $this->mIsRedirect  = intval( $data->page_is_redirect );
                        $this->mLatest      = intval( $data->page_latest );
                } else {
-                       if ( is_object( $this->mTitle ) ) {
-                               $lc->addBadLinkObj( $this->mTitle );
-                       }
+                       $lc->addBadLinkObj( $this->mTitle );
                        $this->mTitle->mArticleID = 0;
                }
 
-               $this->mDataLoaded  = true;
+               $this->mDataLoaded = true;
        }
 
        /**
         * Get text of an article from database
         * Does *NOT* follow redirects.
+        *
         * @param $oldid Int: 0 for whatever the latest revision is
-        * @return string
+        * @return mixed string containing article contents, or false if null
         */
        function fetchContent( $oldid = 0 ) {
                if ( $this->mContentLoaded ) {
@@ -449,28 +518,33 @@ class Article {
 
                if ( $oldid ) {
                        $revision = Revision::newFromId( $oldid );
-                       if ( is_null( $revision ) ) {
+                       if ( $revision === null ) {
                                wfDebug( __METHOD__ . " failed to retrieve specified revision, id $oldid\n" );
                                return false;
                        }
+
                        $data = $this->pageDataFromId( $dbr, $revision->getPage() );
+
                        if ( !$data ) {
                                wfDebug( __METHOD__ . " failed to get page data linked to revision id $oldid\n" );
                                return false;
                        }
+
                        $this->mTitle = Title::makeTitle( $data->page_namespace, $data->page_title );
                        $this->loadPageData( $data );
                } else {
                        if ( !$this->mDataLoaded ) {
                                $data = $this->pageDataFromTitle( $dbr, $this->mTitle );
+
                                if ( !$data ) {
                                        wfDebug( __METHOD__ . " failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" );
                                        return false;
                                }
+
                                $this->loadPageData( $data );
                        }
                        $revision = Revision::newFromId( $this->mLatest );
-                       if ( is_null( $revision ) ) {
+                       if (  $revision === null ) {
                                wfDebug( __METHOD__ . " failed to retrieve current page, rev_id {$this->mLatest}\n" );
                                return false;
                        }
@@ -489,7 +563,7 @@ class Article {
                $this->mContentLoaded = true;
                $this->mRevision =& $revision;
 
-               wfRunHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) ) ;
+               wfRunHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) );
 
                return $this->mContent;
        }
@@ -498,22 +572,12 @@ class Article {
         * Read/write accessor to select FOR UPDATE
         *
         * @param $x Mixed: FIXME
+        * @return mixed value of $x, or value stored in Article::mForUpdate
         */
        public function forUpdate( $x = null ) {
                return wfSetVar( $this->mForUpdate, $x );
        }
 
-       /**
-        * Get the database which should be used for reads
-        *
-        * @return Database
-        * @deprecated - just call wfGetDB( DB_MASTER ) instead
-        */
-       function getDB() {
-               wfDeprecated( __METHOD__ );
-               return wfGetDB( DB_MASTER );
-       }
-
        /**
         * Get options for all SELECT statements
         *
@@ -529,6 +593,7 @@ class Article {
                                $options = 'FOR UPDATE';
                        }
                }
+
                return $options;
        }
 
@@ -536,11 +601,7 @@ class Article {
         * @return int Page ID
         */
        public function getID() {
-               if ( $this->mTitle ) {
-                       return $this->mTitle->getArticleID();
-               } else {
-                       return 0;
-               }
+               return $this->mTitle->getArticleID();
        }
 
        /**
@@ -568,6 +629,7 @@ class Article {
        public function getCount() {
                if ( -1 == $this->mCounter ) {
                        $id = $this->getID();
+
                        if ( $id == 0 ) {
                                $this->mCounter = 0;
                        } else {
@@ -580,11 +642,12 @@ class Article {
                                );
                        }
                }
+
                return $this->mCounter;
        }
 
        /**
-        * Determine whether a page  would be suitable for being counted as an
+        * Determine whether a page would be suitable for being counted as an
         * article in the site_stats table based on the title & its content
         *
         * @param $text String: text to analyze
@@ -594,13 +657,14 @@ class Article {
                global $wgUseCommaCount;
 
                $token = $wgUseCommaCount ? ',' : '[[';
+
                return $this->mTitle->isContentPage() && !$this->isRedirect( $text ) && in_string( $token, $text );
        }
 
        /**
         * Tests if the article text represents a redirect
         *
-        * @param $text String: FIXME
+        * @param $text mixed string containing article contents, or boolean
         * @return bool
         */
        public function isRedirect( $text = false ) {
@@ -608,12 +672,14 @@ class Article {
                        if ( $this->mDataLoaded ) {
                                return $this->mIsRedirect;
                        }
+
                        // Apparently loadPageData was never called
                        $this->loadContent();
                        $titleObj = Title::newFromRedirectRecurse( $this->fetchContent() );
                } else {
                        $titleObj = Title::newFromRedirect( $text );
                }
+
                return $titleObj !== null;
        }
 
@@ -627,6 +693,7 @@ class Article {
                if ( $this->getOldID() == 0 ) {
                        return true;
                }
+
                return $this->exists() && isset( $this->mRevision ) && $this->mRevision->isCurrent();
        }
 
@@ -635,12 +702,15 @@ class Article {
         * This isn't necessary for all uses, so it's only done if needed.
         */
        protected function loadLastEdit() {
-               if ( -1 != $this->mUser )
+               if ( -1 != $this->mUser ) {
                        return;
+               }
 
                # New or non-existent articles have no user information
                $id = $this->getID();
-               if ( 0 == $id ) return;
+               if ( 0 == $id ) {
+                       return;
+               }
 
                $this->mLastRevision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id );
                if ( !is_null( $this->mLastRevision ) ) {
@@ -653,46 +723,71 @@ class Article {
                }
        }
 
+       /**
+        * @return string GMT timestamp of last article revision
+        **/
+
        public function getTimestamp() {
                // Check if the field has been filled by ParserCache::get()
                if ( !$this->mTimestamp ) {
                        $this->loadLastEdit();
                }
+
                return wfTimestamp( TS_MW, $this->mTimestamp );
        }
 
+       /**
+        * @return int user ID for the user that made the last article revision
+        */
        public function getUser() {
                $this->loadLastEdit();
                return $this->mUser;
        }
 
+       /**
+        * @return string username of the user that made the last article revision
+        */
        public function getUserText() {
                $this->loadLastEdit();
                return $this->mUserText;
        }
 
+       /**
+        * @return string Comment stored for the last article revision
+        */
        public function getComment() {
                $this->loadLastEdit();
                return $this->mComment;
        }
 
+       /**
+        * Returns true if last revision was marked as "minor edit"
+        *
+        * @return boolean Minor edit indicator for the last article revision.
+        */
        public function getMinorEdit() {
                $this->loadLastEdit();
                return $this->mMinorEdit;
        }
 
-       /* Use this to fetch the rev ID used on page views */
+       /**
+        * Use this to fetch the rev ID used on page views
+        *
+        * @return int revision ID of last article revision
+        */
        public function getRevIdFetched() {
                $this->loadLastEdit();
                return $this->mRevIdFetched;
        }
 
        /**
+        * FIXME: this does what?
         * @param $limit Integer: default 0.
         * @param $offset Integer: default 0.
+        * @return UserArrayFromResult object with User objects of article contributors for requested range
         */
        public function getContributors( $limit = 0, $offset = 0 ) {
-               # XXX: this is expensive; cache this info somewhere.
+               # FIXME: this is expensive; cache this info somewhere.
 
                $dbr = wfGetDB( DB_SLAVE );
                $revTable = $dbr->tableName( 'revision' );
@@ -701,6 +796,7 @@ class Article {
                $pageId = $this->getId();
 
                $user = $this->getUser();
+
                if ( $user ) {
                        $excludeCond = "AND rev_user != $user";
                } else {
@@ -718,8 +814,9 @@ class Article {
                        GROUP BY rev_user, rev_user_text
                        ORDER BY timestamp DESC";
 
-               if ( $limit > 0 )
+               if ( $limit > 0 ) {
                        $sql = $dbr->limitResult( $sql, $limit, $offset );
+               }
 
                $sql .= ' ' . $this->getSelectOptions();
                $res = $dbr->query( $sql, __METHOD__ );
@@ -732,9 +829,8 @@ class Article {
         * page of the given title.
         */
        public function view() {
-               global $wgUser, $wgOut, $wgRequest, $wgContLang;
-               global $wgEnableParserCache, $wgStylePath, $wgParser;
-               global $wgUseTrackbacks, $wgUseFileCache;
+               global $wgUser, $wgOut, $wgRequest, $wgParser;
+               global $wgUseFileCache, $wgUseETag;
 
                wfProfileIn( __METHOD__ );
 
@@ -742,22 +838,26 @@ class Article {
                $oldid = $this->getOldID();
                $parserCache = ParserCache::singleton();
 
-               $parserOptions = clone $this->getParserOptions();
+               $parserOptions = $this->getParserOptions();
                # Render printable version, use printable version cache
                if ( $wgOut->isPrintable() ) {
                        $parserOptions->setIsPrintable( true );
+                       $parserOptions->setEditSection( false );
+               } else if ( $wgUseETag && !$this->mTitle->quickUserCan( 'edit' ) ) {
+                       $parserOptions->setEditSection( false );
                }
 
                # Try client and file cache
                if ( $oldid === 0 && $this->checkTouched() ) {
-                       global $wgUseETag;
                        if ( $wgUseETag ) {
                                $wgOut->setETag( $parserCache->getETag( $this, $parserOptions ) );
                        }
+
                        # Is is client cached?
                        if ( $wgOut->checkLastModified( $this->getTouched() ) ) {
                                wfDebug( __METHOD__ . ": done 304\n" );
                                wfProfileOut( __METHOD__ );
+
                                return;
                        # Try file cache
                        } else if ( $wgUseFileCache && $this->tryFileCache() ) {
@@ -766,17 +866,17 @@ class Article {
                                $wgOut->disable();
                                $this->viewUpdates();
                                wfProfileOut( __METHOD__ );
+
                                return;
                        }
                }
 
-               $sk = $wgUser->getSkin();
-
                # getOldID may want us to redirect somewhere else
                if ( $this->mRedirectUrl ) {
                        $wgOut->redirect( $this->mRedirectUrl );
                        wfDebug( __METHOD__ . ": redirecting due to oldid\n" );
                        wfProfileOut( __METHOD__ );
+
                        return;
                }
 
@@ -785,29 +885,25 @@ class Article {
                $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
 
                # If we got diff in the query, we want to see a diff page instead of the article.
-               if ( !is_null( $wgRequest->getVal( 'diff' ) ) ) {
+               if ( $wgRequest->getCheck( 'diff' ) ) {
                        wfDebug( __METHOD__ . ": showing diff page\n" );
                        $this->showDiffPage();
                        wfProfileOut( __METHOD__ );
+
                        return;
                }
 
+               if ( !$wgUseETag && !$this->mTitle->quickUserCan( 'edit' ) ) {
+                       $parserOptions->setEditSection( false );
+               }
+
                # Should the parser cache be used?
                $useParserCache = $this->useParserCache( $oldid );
                wfDebug( 'Article::view using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
-               if ( $wgUser->getOption( 'stubthreshold' ) ) {
+               if ( $wgUser->getStubThreshold() ) {
                        wfIncrStats( 'pcache_miss_stub' );
                }
 
-               # For the main page, overwrite the <title> element with the con-
-               # tents of 'pagetitle-view-mainpage' instead of the default (if
-               # that's not empty).
-               if ( $this->mTitle->equals( Title::newMainPage() )
-                       && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' ) ) !== '' )
-               {
-                       $wgOut->setHTMLTitle( $m );
-               }
-
                $wasRedirected = $this->showRedirectedFromHeader();
                $this->showNamespaceHeader();
 
@@ -815,16 +911,18 @@ class Article {
                # Keep going until $outputDone is set, or we run out of things to do.
                $pass = 0;
                $outputDone = false;
+               $this->mParserOutput = false;
+
                while ( !$outputDone && ++$pass ) {
                        switch( $pass ) {
                                case 1:
                                        wfRunHooks( 'ArticleViewHeader', array( &$this, &$outputDone, &$useParserCache ) );
                                        break;
-
                                case 2:
                                        # Try the parser cache
                                        if ( $useParserCache ) {
                                                $this->mParserOutput = $parserCache->get( $this, $parserOptions );
+
                                                if ( $this->mParserOutput !== false ) {
                                                        wfDebug( __METHOD__ . ": showing parser cache contents\n" );
                                                        $wgOut->addParserOutput( $this->mParserOutput );
@@ -835,7 +933,6 @@ class Article {
                                                }
                                        }
                                        break;
-
                                case 3:
                                        $text = $this->getContent();
                                        if ( $text === false || $this->getID() == 0 ) {
@@ -858,22 +955,22 @@ class Article {
                                        # Are we looking at an old revision
                                        if ( $oldid && !is_null( $this->mRevision ) ) {
                                                $this->setOldSubtitle( $oldid );
+
                                                if ( !$this->showDeletedRevisionHeader() ) {
                                                        wfDebug( __METHOD__ . ": cannot view deleted revision\n" );
                                                        wfProfileOut( __METHOD__ );
                                                        return;
                                                }
+
                                                # If this "old" version is the current, then try the parser cache...
                                                if ( $oldid === $this->getLatest() && $this->useParserCache( false ) ) {
                                                        $this->mParserOutput = $parserCache->get( $this, $parserOptions );
                                                        if ( $this->mParserOutput ) {
-                                                               wfDebug( __METHOD__ . ": showing parser cache for current rev permalink\n" );
+                                                               wfDebug( __METHOD__ . ": showing parser cache for current rev permalink\n" );                                                           
                                                                $wgOut->addParserOutput( $this->mParserOutput );
                                                                $wgOut->setRevisionId( $this->mLatest );
-                                                               $this->showViewFooter();
-                                                               $this->viewUpdates();
-                                                               wfProfileOut( __METHOD__ );
-                                                               return;
+                                                               $outputDone = true;
+                                                               break;                                                          
                                                        }
                                                }
                                        }
@@ -898,31 +995,47 @@ class Article {
                                                $outputDone = true;
                                        }
                                        break;
-
                                case 4:
                                        # Run the parse, protected by a pool counter
                                        wfDebug( __METHOD__ . ": doing uncached parse\n" );
-                                       $key = $parserCache->getKey( $this, $parserOptions );
-                                       $poolCounter = PoolCounter::factory( 'Article::view', $key );
-                                       $dirtyCallback = $useParserCache ? array( $this, 'tryDirtyCache' ) : false;
-                                       $status = $poolCounter->executeProtected( array( $this, 'doViewParse' ), $dirtyCallback );
 
-                                       if ( !$status->isOK() ) {
+                                       $this->checkTouched();
+                                       $key = $parserCache->getKey( $this, $parserOptions );
+                                       $poolArticleView = new PoolWorkArticleView( $this, $key, $useParserCache, $parserOptions );
+                                       
+                                       if ( !$poolArticleView->execute() ) {
                                                # Connection or timeout error
-                                               $this->showPoolError( $status );
                                                wfProfileOut( __METHOD__ );
                                                return;
                                        } else {
                                                $outputDone = true;
                                        }
                                        break;
-
                                # Should be unreachable, but just in case...
                                default:
                                        break 2;
                        }
                }
 
+               # Adjust the title if it was set by displaytitle, -{T|}- or language conversion
+               if ( $this->mParserOutput ) {
+                       $titleText = $this->mParserOutput->getTitleText();
+
+                       if ( strval( $titleText ) !== '' ) {
+                               $wgOut->setPageTitle( $titleText );
+                       }
+               }
+
+               # For the main page, overwrite the <title> element with the con-
+               # tents of 'pagetitle-view-mainpage' instead of the default (if
+               # that's not empty).
+               # This message always exists because it is in the i18n files
+               if ( $this->mTitle->equals( Title::newMainPage() )
+                       && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' ) ) !== '' )
+               {
+                       $wgOut->setHTMLTitle( $m );
+               }
+
                # Now that we've filled $this->mParserOutput, we know whether
                # there are any __NOINDEX__ tags on the page
                $policy = $this->getRobotPolicy( 'view' );
@@ -939,7 +1052,7 @@ class Article {
         * Article::view() only, other callers should use the DifferenceEngine class.
         */
        public function showDiffPage() {
-               global $wgOut, $wgRequest, $wgUser;
+               global $wgRequest, $wgUser;
 
                $diff = $wgRequest->getVal( 'diff' );
                $rcid = $wgRequest->getVal( 'rcid' );
@@ -968,9 +1081,11 @@ class Article {
         * This is hooked by SyntaxHighlight_GeSHi to do syntax highlighting of these
         * page views.
         */
-       public function showCssOrJsPage() {
+       protected function showCssOrJsPage() {
                global $wgOut;
-               $wgOut->addHTML( wfMsgExt( 'clearyourcache', 'parse' ) );
+
+               $wgOut->wrapWikiMsg( "<div id='mw-clearyourcache'>\n$1\n</div>", 'clearyourcache' );
+
                // Give hooks a chance to customise the output
                if ( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->mTitle, $wgOut ) ) ) {
                        // Wrap the whole lot in a <pre> and don't parse
@@ -982,18 +1097,6 @@ class Article {
                }
        }
 
-       /**
-        * Get the robot policy to be used for the current action=view request.
-        * @return String the policy that should be set
-        * @deprecated use getRobotPolicy() instead, which returns an associative
-        *    array
-        */
-       public function getRobotPolicyForView() {
-               wfDeprecated( __FUNC__ );
-               $policy = $this->getRobotPolicy( 'view' );
-               return $policy['index'] . ',' . $policy['follow'];
-       }
-
        /**
         * Get the robot policy to be used for the current view
         * @param $action String the action= GET parameter
@@ -1001,34 +1104,42 @@ class Article {
         * TODO: actions other than 'view'
         */
        public function getRobotPolicy( $action ) {
-
                global $wgOut, $wgArticleRobotPolicies, $wgNamespaceRobotPolicies;
                global $wgDefaultRobotPolicy, $wgRequest;
 
                $ns = $this->mTitle->getNamespace();
+
                if ( $ns == NS_USER || $ns == NS_USER_TALK ) {
                        # Don't index user and user talk pages for blocked users (bug 11443)
                        if ( !$this->mTitle->isSubpage() ) {
                                $block = new Block();
                                if ( $block->load( $this->mTitle->getText() ) ) {
-                                       return array( 'index'  => 'noindex',
-                                                     'follow' => 'nofollow' );
+                                       return array(
+                                               'index'  => 'noindex',
+                                               'follow' => 'nofollow'
+                                       );
                                }
                        }
                }
 
                if ( $this->getID() === 0 || $this->getOldID() ) {
                        # Non-articles (special pages etc), and old revisions
-                       return array( 'index'  => 'noindex',
-                                     'follow' => 'nofollow' );
+                       return array(
+                               'index'  => 'noindex',
+                               'follow' => 'nofollow'
+                       );
                } elseif ( $wgOut->isPrintable() ) {
                        # Discourage indexing of printable versions, but encourage following
-                       return array( 'index'  => 'noindex',
-                                     'follow' => 'follow' );
+                       return array(
+                               'index'  => 'noindex',
+                               'follow' => 'follow'
+                       );
                } elseif ( $wgRequest->getInt( 'curid' ) ) {
                        # For ?curid=x urls, disallow indexing
-                       return array( 'index'  => 'noindex',
-                                     'follow' => 'follow' );
+                       return array(
+                               'index'  => 'noindex',
+                               'follow' => 'follow'
+                       );
                }
 
                # Otherwise, construct the policy based on the various config variables.
@@ -1036,24 +1147,29 @@ class Article {
 
                if ( isset( $wgNamespaceRobotPolicies[$ns] ) ) {
                        # Honour customised robot policies for this namespace
-                       $policy = array_merge( $policy,
-                                              self::formatRobotPolicy( $wgNamespaceRobotPolicies[$ns] ) );
+                       $policy = array_merge(
+                               $policy,
+                               self::formatRobotPolicy( $wgNamespaceRobotPolicies[$ns] )
+                       );
                }
                if ( $this->mTitle->canUseNoindex() && is_object( $this->mParserOutput ) && $this->mParserOutput->getIndexPolicy() ) {
                        # __INDEX__ and __NOINDEX__ magic words, if allowed. Incorporates
                        # a final sanity check that we have really got the parser output.
-                       $policy = array_merge( $policy,
-                                              array( 'index' => $this->mParserOutput->getIndexPolicy() ) );
+                       $policy = array_merge(
+                               $policy,
+                               array( 'index' => $this->mParserOutput->getIndexPolicy() )
+                       );
                }
 
                if ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) {
                        # (bug 14900) site config can override user-defined __INDEX__ or __NOINDEX__
-                       $policy = array_merge( $policy,
-                                              self::formatRobotPolicy( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) );
+                       $policy = array_merge(
+                               $policy,
+                               self::formatRobotPolicy( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] )
+                       );
                }
 
                return $policy;
-
        }
 
        /**
@@ -1081,6 +1197,7 @@ class Article {
                                $arr['follow'] = $var;
                        }
                }
+
                return $arr;
        }
 
@@ -1088,12 +1205,15 @@ class Article {
         * If this request is a redirect view, send "redirected from" subtitle to
         * $wgOut. Returns true if the header was needed, false if this is not a
         * redirect view. Handles both local and remote redirects.
+        *
+        * @return boolean
         */
        public function showRedirectedFromHeader() {
                global $wgOut, $wgUser, $wgRequest, $wgRedirectSources;
 
                $rdfrom = $wgRequest->getVal( 'rdfrom' );
                $sk = $wgUser->getSkin();
+
                if ( isset( $this->mRedirectedFrom ) ) {
                        // This is an internally redirected page view.
                        // We'll need a backlink to the source page for navigation.
@@ -1105,6 +1225,7 @@ class Article {
                                        array( 'redirect' => 'no' ),
                                        array( 'known', 'noclasses' )
                                );
+
                                $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
                                $wgOut->setSubtitle( $s );
 
@@ -1118,6 +1239,7 @@ class Article {
                                $wgOut->addLink( array( 'rel' => 'canonical',
                                        'href' => $this->mTitle->getLocalURL() )
                                );
+
                                return true;
                        }
                } elseif ( $rdfrom ) {
@@ -1127,9 +1249,11 @@ class Article {
                                $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
                                $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
                                $wgOut->setSubtitle( $s );
+
                                return true;
                        }
                }
+
                return false;
        }
 
@@ -1139,10 +1263,11 @@ class Article {
         */
        public function showNamespaceHeader() {
                global $wgOut;
+
                if ( $this->mTitle->isTalkPage() ) {
                        $msg = wfMsgNoTrans( 'talkpageheader' );
                        if ( $msg !== '-' && !wfEmptyMsg( 'talkpageheader', $msg ) ) {
-                               $wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1</div>", array( 'talkpageheader' ) );
+                               $wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1\n</div>", array( 'talkpageheader' ) );
                        }
                }
        }
@@ -1151,7 +1276,8 @@ class Article {
         * Show the footer section of an ordinary page view
         */
        public function showViewFooter() {
-               global $wgOut, $wgUseTrackbacks, $wgRequest;
+               global $wgOut, $wgUseTrackbacks;
+
                # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
                if ( $this->mTitle->getNamespace() == NS_USER_TALK && IP::isValid( $this->mTitle->getText() ) ) {
                        $wgOut->addWikiMsg( 'anontalkpagetext' );
@@ -1174,13 +1300,15 @@ class Article {
         */
        public function showPatrolFooter() {
                global $wgOut, $wgRequest, $wgUser;
+
                $rcid = $wgRequest->getVal( 'rcid' );
 
-               if ( !$rcid || !$this->mTitle->exists() || !$this->mTitle->quickUserCan( 'patrol' ) ) {
+               if ( !$rcid || !$this->mTitle->quickUserCan( 'patrol' ) ) {
                        return;
                }
 
                $sk = $wgUser->getSkin();
+               $token = $wgUser->editToken();
 
                $wgOut->addHTML(
                        "<div class='patrollink'>" .
@@ -1192,7 +1320,8 @@ class Article {
                                                array(),
                                                array(
                                                        'action' => 'markpatrolled',
-                                                       'rcid' => $rcid
+                                                       'rcid' => $rcid,
+                                                       'token' => $token,
                                                ),
                                                array( 'known', 'noclasses' )
                                        )
@@ -1214,8 +1343,9 @@ class Article {
                        $rootPart = $parts[0];
                        $user = User::newFromName( $rootPart, false /* allow IP users*/ );
                        $ip = User::isIP( $rootPart );
+
                        if ( !$user->isLoggedIn() && !$ip ) { # User does not exist
-                               $wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n\$1</div>",
+                               $wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n\$1\n</div>",
                                        array( 'userpage-userdoesnotexist-view', $rootPart ) );
                        } else if ( $user->isBlocked() ) { # Show log extract if the user is currently blocked
                                LogEventsList::showLogExtract(
@@ -1234,7 +1364,9 @@ class Article {
                                );
                        }
                }
+
                wfRunHooks( 'ShowMissingArticle', array( $this ) );
+
                # Show delete and move logs
                LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move' ), $this->mTitle->getPrefixedText(), '',
                        array(  'lim' => 10,
@@ -1253,48 +1385,46 @@ class Article {
                        // Use the default message text
                        $text = $this->getContent();
                } else {
-                       # If it is a user (talk) page of the current user, add true as parameter, otherwise false.
-                       $isCurrent = false;
-                       if ( ( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK )
-                               && $wgUser->getName() == $this->mTitle->getBaseText() )
-                       {
-                               $isCurrent = true;
-                       }
-
-                       # Don't show option "create this page" in the message if the user isn't allowed to.
                        $createErrors = $this->mTitle->getUserPermissionsErrors( 'create', $wgUser );
                        $editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser );
                        $errors = array_merge( $createErrors, $editErrors );
 
-                       if ( !count( $errors ) )
-                               $text = wfMsgNoTrans( 'noarticletext', $isCurrent );
-                       else
-                               $text = wfMsgNoTrans( 'noarticletext-nopermission', $isCurrent );
+                       if ( !count( $errors ) ) {
+                               $text = wfMsgNoTrans( 'noarticletext' );
+                       } else {
+                               $text = wfMsgNoTrans( 'noarticletext-nopermission' );
+                       }
                }
                $text = "<div class='noarticletext'>\n$text\n</div>";
+
                if ( !$this->hasViewableContent() ) {
                        // If there's no backing content, send a 404 Not Found
                        // for better machine handling of broken links.
                        $wgRequest->response()->header( "HTTP/1.x 404 Not Found" );
                }
+
                $wgOut->addWikiText( $text );
        }
 
        /**
         * If the revision requested for view is deleted, check permissions.
         * Send either an error message or a warning header to $wgOut.
-        * Returns true if the view is allowed, false if not.
+        *
+        * @return boolean true if the view is allowed, false if not.
         */
        public function showDeletedRevisionHeader() {
                global $wgOut, $wgRequest;
+
                if ( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
                        // Not deleted
                        return true;
                }
+
                // If the user is not allowed to see it...
                if ( !$this->mRevision->userCan( Revision::DELETED_TEXT ) ) {
-                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n",
+                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n",
                                'rev-deleted-text-permission' );
+
                        return false;
                // If the user needs to confirm that they want to see it...
                } else if ( $wgRequest->getInt( 'unhide' ) != 1 ) {
@@ -1303,26 +1433,30 @@ class Article {
                        $link = $this->mTitle->getFullUrl( "oldid={$oldid}&unhide=1" );
                        $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ?
                                'rev-suppressed-text-unhide' : 'rev-deleted-text-unhide';
-                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n",
+                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n",
                                array( $msg, $link ) );
+
                        return false;
                // We are allowed to see...
                } else {
                        $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ?
                                'rev-suppressed-text-view' : 'rev-deleted-text-view';
-                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", $msg );
+                       $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", $msg );
+
                        return true;
                }
        }
 
-       /*
-       * Should the parser cache be used?
-       */
+       /**
+        * Should the parser cache be used?
+        *
+        * @return boolean
+        */
        public function useParserCache( $oldid ) {
                global $wgUser, $wgEnableParserCache;
 
                return $wgEnableParserCache
-                       && intval( $wgUser->getOption( 'stubthreshold' ) ) == 0
+                       && $wgUser->getStubThreshold() == 0
                        && $this->exists()
                        && empty( $oldid )
                        && !$this->mTitle->isCssOrJsPage()
@@ -1334,15 +1468,23 @@ class Article {
         */
        public function doViewParse() {
                global $wgOut;
+
                $oldid = $this->getOldID();
                $useParserCache = $this->useParserCache( $oldid );
-               $parserOptions = clone $this->getParserOptions();
+               $parserOptions = $this->getParserOptions();
+
                # Render printable version, use printable version cache
                $parserOptions->setIsPrintable( $wgOut->isPrintable() );
+
                # Don't show section-edit links on old revisions... this way lies madness.
-               $parserOptions->setEditSection( $this->isCurrent() );
+               if ( !$this->isCurrent() || $wgOut->isPrintable() ) {
+                       $parserOptions->setEditSection( false );
+               }
+               
                $useParserCache = $this->useParserCache( $oldid );
                $this->outputWikiText( $this->getContent(), $useParserCache, $parserOptions );
+               
+               return true;
        }
 
        /**
@@ -1350,13 +1492,21 @@ class Article {
         * output it and return true. If it is not present, output nothing and
         * return false. This is used as a callback function for
         * PoolCounter::executeProtected().
+        *
+        * @return boolean
         */
        public function tryDirtyCache() {
                global $wgOut;
                $parserCache = ParserCache::singleton();
-               $options = $this->getParserOptions();
-               $options->setIsPrintable( $wgOut->isPrintable() );
+               $options = clone $this->getParserOptions();
+               
+               if ( $wgOut->isPrintable() ) {
+                       $options->setIsPrintable( true );
+                       $options->setEditSection( false );
+               }
+               
                $output = $parserCache->getDirty( $this, $options );
+
                if ( $output ) {
                        wfDebug( __METHOD__ . ": sending dirty output\n" );
                        wfDebugLog( 'dirty', "dirty output " . $parserCache->getKey( $this, $options ) . "\n" );
@@ -1364,124 +1514,120 @@ class Article {
                        $this->mParserOutput = $output;
                        $wgOut->addParserOutput( $output );
                        $wgOut->addHTML( "<!-- parser cache is expired, sending anyway due to pool overload-->\n" );
+
                        return true;
                } else {
                        wfDebugLog( 'dirty', "dirty missing\n" );
                        wfDebug( __METHOD__ . ": no dirty cache\n" );
+
                        return false;
                }
        }
 
-       /**
-        * Show an error page for an error from the pool counter.
-        * @param $status Status
-        */
-       public function showPoolError( $status ) {
-               global $wgOut;
-               $wgOut->clearHTML(); // for release() errors
-               $wgOut->enableClientCache( false );
-               $wgOut->setRobotPolicy( 'noindex,nofollow' );
-               $wgOut->addWikiText(
-                       '<div class="errorbox">' .
-                       $status->getWikiText( false, 'view-pool-error' ) .
-                       '</div>'
-               );
-       }
-
        /**
         * View redirect
+        *
         * @param $target Title object or Array of destination(s) to redirect
         * @param $appendSubtitle Boolean [optional]
         * @param $forceKnown Boolean: should the image be shown as a bluelink regardless of existence?
+        * @return string containing HMTL with redirect link
         */
        public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
                global $wgOut, $wgContLang, $wgStylePath, $wgUser;
-               # Display redirect
+
                if ( !is_array( $target ) ) {
                        $target = array( $target );
                }
+
                $imageDir = $wgContLang->getDir();
-               $imageUrl = $wgStylePath . '/common/images/redirect' . $imageDir . '.png';
-               $imageUrl2 = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png';
-               $alt2 = $wgContLang->isRTL() ? '&larr;' : '&rarr;'; // should -> and <- be used instead of entities?
 
                if ( $appendSubtitle ) {
                        $wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) );
                }
+
                $sk = $wgUser->getSkin();
                // the loop prepends the arrow image before the link, so the first case needs to be outside
                $title = array_shift( $target );
+
                if ( $forceKnown ) {
-                       $link = $sk->link(
-                               $title,
-                               htmlspecialchars( $title->getFullText() ),
-                               array(),
-                               array(),
-                               array( 'known', 'noclasses' )
-                       );
+                       $link = $sk->linkKnown( $title, htmlspecialchars( $title->getFullText() ) );
                } else {
                        $link = $sk->link( $title, htmlspecialchars( $title->getFullText() ) );
                }
-               // automatically append redirect=no to each link, since most of them are redirect pages themselves
+
+               $nextRedirect = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png';
+               $alt = $wgContLang->isRTL() ? '←' : '→';
+               // Automatically append redirect=no to each link, since most of them are redirect pages themselves.
+               // FIXME: where this happens?
                foreach ( $target as $rt ) {
+                       $link .= Html::element( 'img', array( 'src' => $nextRedirect, 'alt' => $alt ) );
                        if ( $forceKnown ) {
-                               $link .= '<img src="' . $imageUrl2 . '" alt="' . $alt2 . ' " />'
-                                       . $sk->link(
-                                               $rt,
-                                               htmlspecialchars( $rt->getFullText() ),
-                                               array(),
-                                               array(),
-                                               array( 'known', 'noclasses' )
-                                       );
+                               $link .= $sk->linkKnown( $rt, htmlspecialchars( $rt->getFullText() ) );
                        } else {
-                               $link .= '<img src="' . $imageUrl2 . '" alt="' . $alt2 . ' " />'
-                                       . $sk->link( $rt, htmlspecialchars( $rt->getFullText() ) );
+                               $link .= $sk->link( $rt, htmlspecialchars( $rt->getFullText() ) );
                        }
                }
-               return '<img src="' . $imageUrl . '" alt="#REDIRECT " />' .
-                       '<span class="redirectText">' . $link . '</span>';
 
+               $imageUrl = $wgStylePath . '/common/images/redirect' . $imageDir . '.png';              
+               return Html::element( 'img', array( 'src' => $imageUrl, 'alt' => '#REDIRECT' ) ) .
+                       '<span class="redirectText">' . $link . '</span>';
        }
 
+       /**
+        * Builds trackback links for article display if $wgUseTrackbacks is set to true
+        */
        public function addTrackbacks() {
                global $wgOut, $wgUser;
+
                $dbr = wfGetDB( DB_SLAVE );
                $tbs = $dbr->select( 'trackbacks',
                        array( 'tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name' ),
                        array( 'tb_page' => $this->getID() )
                );
-               if ( !$dbr->numRows( $tbs ) ) return;
+
+               if ( !$dbr->numRows( $tbs ) ) {
+                       return;
+               }
 
                $tbtext = "";
                while ( $o = $dbr->fetchObject( $tbs ) ) {
                        $rmvtxt = "";
+
                        if ( $wgUser->isAllowed( 'trackback' ) ) {
                                $delurl = $this->mTitle->getFullURL( "action=deletetrackback&tbid=" .
                                        $o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) );
                                $rmvtxt = wfMsg( 'trackbackremove', htmlspecialchars( $delurl ) );
                        }
+
                        $tbtext .= "\n";
-                       $tbtext .= wfMsg( strlen( $o->tb_ex ) ? 'trackbackexcerpt' : 'trackback',
+                       $tbtext .= wfMsgNoTrans( strlen( $o->tb_ex ) ? 'trackbackexcerpt' : 'trackback',
                                        $o->tb_title,
                                        $o->tb_url,
                                        $o->tb_ex,
                                        $o->tb_name,
                                        $rmvtxt );
                }
-               $wgOut->wrapWikiMsg( "<div id='mw_trackbacks'>$1</div>\n", array( 'trackbackbox', $tbtext ) );
-               $this->mTitle->invalidateCache();
+
+               $wgOut->wrapWikiMsg( "<div id='mw_trackbacks'>\n$1\n</div>\n", array( 'trackbackbox', $tbtext ) );
        }
 
+       /**
+        * Removes trackback record for current article from trackbacks table
+        */
        public function deletetrackback() {
                global $wgUser, $wgRequest, $wgOut;
+
                if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) {
                        $wgOut->addWikiMsg( 'sessionfailure' );
+
                        return;
                }
 
                $permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser );
+
                if ( count( $permission_errors ) ) {
                        $wgOut->showPermissionsErrorPage( $permission_errors );
+
                        return;
                }
 
@@ -1492,8 +1638,13 @@ class Article {
                $this->mTitle->invalidateCache();
        }
 
+       /**
+        * Handle action=render
+        */
+
        public function render() {
                global $wgOut;
+
                $wgOut->setArticleBodyOnly( true );
                $this->view();
        }
@@ -1503,22 +1654,30 @@ class Article {
         */
        public function purge() {
                global $wgUser, $wgRequest, $wgOut;
+
                if ( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) {
+                       //FIXME: shouldn't this be in doPurge()?
                        if ( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
                                $this->doPurge();
                                $this->view();
                        }
                } else {
-                       $action = htmlspecialchars( $wgRequest->getRequestURL() );
-                       $button = wfMsgExt( 'confirm_purge_button', array( 'escapenoentities' ) );
-                       $form = "<form method=\"post\" action=\"$action\">\n" .
-                                       "<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
-                                       "</form>\n";
-                       $top = wfMsgExt( 'confirm-purge-top', array( 'parse' ) );
-                       $bottom = wfMsgExt( 'confirm-purge-bottom', array( 'parse' ) );
+                       $formParams = array(
+                               'method' => 'post',
+                               'action' =>  $wgRequest->getRequestURL(),
+                       );
+
+                       $wgOut->addWikiMsg( 'confirm-purge-top' );
+
+                       $form  = Html::openElement( 'form', $formParams );
+                       $form .= Xml::submitButton( wfMsg( 'confirm_purge_button' ) );
+                       $form .= Html::closeElement( 'form' );
+                       
+                       $wgOut->addHTML( $form );
+                       $wgOut->addWikiMsg( 'confirm-purge-bottom' );
+
                        $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
                        $wgOut->setRobotPolicy( 'noindex,nofollow' );
-                       $wgOut->addHTML( $top . $form . $bottom );
                }
        }
 
@@ -1527,6 +1686,7 @@ class Article {
         */
        public function doPurge() {
                global $wgUseSquid;
+
                // Invalidate the cache
                $this->mTitle->invalidateCache();
 
@@ -1539,13 +1699,16 @@ class Article {
                        $update = SquidUpdate::newSimplePurge( $this->mTitle );
                        $update->doUpdate();
                }
+
                if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
                        global $wgMessageCache;
+
                        if ( $this->getID() == 0 ) {
                                $text = false;
                        } else {
                                $text = $this->getRawText();
                        }
+
                        $wgMessageCache->replace( $this->mTitle->getDBkey(), $text );
                }
        }
@@ -1553,7 +1716,7 @@ class Article {
        /**
         * Insert a new empty page record for this article.
         * This *must* be followed up by creating a revision
-        * and running $this->updateToLatest( $rev_id );
+        * and running $this->updateRevisionOn( ... );
         * or else the record will be left in a funky state.
         * Best if all done inside a transaction.
         *
@@ -1580,11 +1743,13 @@ class Article {
                ), __METHOD__, 'IGNORE' );
 
                $affected = $dbw->affectedRows();
+
                if ( $affected ) {
                        $newid = $dbw->insertId();
                        $this->mTitle->resetArticleId( $newid );
                }
                wfProfileOut( __METHOD__ );
+
                return $affected ? $newid : false;
        }
 
@@ -1600,26 +1765,33 @@ class Article {
         *                      on.
         * @param $lastRevIsRedirect Boolean: if given, will optimize adding and
         *                           removing rows in redirect table.
+        * @param $setNewFlag Boolean: Set to true if a page flag should be set
+        *                    Needed when $lastRevision has to be set to sth. !=0
         * @return bool true on success, false on failure
         * @private
         */
-       public function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null ) {
+       public function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null, $setNewFlag = false ) {
                wfProfileIn( __METHOD__ );
 
                $text = $revision->getText();
-               $rt = Title::newFromRedirect( $text );
+               $rt = Title::newFromRedirectRecurse( $text );
 
                $conditions = array( 'page_id' => $this->getId() );
+
                if ( !is_null( $lastRevision ) ) {
                        # An extra check against threads stepping on each other
                        $conditions['page_latest'] = $lastRevision;
                }
 
+               if ( !$setNewFlag ) {
+                       $setNewFlag = ( $lastRevision === 0 );
+               }
+
                $dbw->update( 'page',
                        array( /* SET */
                                'page_latest'      => $revision->getId(),
                                'page_touched'     => $dbw->timestamp(),
-                               'page_is_new'      => ( $lastRevision === 0 ) ? 1 : 0,
+                               'page_is_new'      => $setNewFlag,
                                'page_is_redirect' => $rt !== null ? 1 : 0,
                                'page_len'         => strlen( $text ),
                        ),
@@ -1651,27 +1823,25 @@ class Article {
                // Update/Insert if we don't know if the last revision was a redirect or not
                // Delete if changing from redirect to non-redirect
                $isRedirect = !is_null( $redirectTitle );
+
                if ( $isRedirect || is_null( $lastRevIsRedirect ) || $lastRevIsRedirect !== $isRedirect ) {
                        wfProfileIn( __METHOD__ );
                        if ( $isRedirect ) {
-                               // This title is a redirect, Add/Update row in the redirect table
-                               $set = array( /* SET */
-                                       'rd_namespace' => $redirectTitle->getNamespace(),
-                                       'rd_title'     => $redirectTitle->getDBkey(),
-                                       'rd_from'      => $this->getId(),
-                               );
-                               $dbw->replace( 'redirect', array( 'rd_from' ), $set, __METHOD__ );
+                               $this->insertRedirectEntry( $redirectTitle );
                        } else {
                                // This is not a redirect, remove row from redirect table
                                $where = array( 'rd_from' => $this->getId() );
                                $dbw->delete( 'redirect', $where, __METHOD__ );
                        }
+
                        if ( $this->getTitle()->getNamespace() == NS_FILE ) {
                                RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() );
                        }
                        wfProfileOut( __METHOD__ );
+
                        return ( $dbw->affectedRows() != 0 );
                }
+
                return true;
        }
 
@@ -1681,9 +1851,11 @@ class Article {
         *
         * @param $dbw Database object
         * @param $revision Revision object
+        * @return mixed
         */
        public function updateIfNewerOn( &$dbw, $revision ) {
                wfProfileIn( __METHOD__ );
+
                $row = $dbw->selectRow(
                        array( 'revision', 'page' ),
                        array( 'rev_id', 'rev_timestamp', 'page_is_redirect' ),
@@ -1691,6 +1863,7 @@ class Article {
                                'page_id' => $this->getId(),
                                'page_latest=rev_id' ),
                        __METHOD__ );
+
                if ( $row ) {
                        if ( wfTimestamp( TS_MW, $row->rev_timestamp ) >= $revision->getTimestamp() ) {
                                wfProfileOut( __METHOD__ );
@@ -1703,17 +1876,23 @@ class Article {
                        $prev = 0;
                        $lastRevIsRedirect = null;
                }
+
                $ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect );
+
                wfProfileOut( __METHOD__ );
                return $ret;
        }
 
        /**
         * @param $section empty/null/false or a section number (0, 1, 2, T1, T2...)
+        * @param $text String: new text of the section
+        * @param $summary String: new section's subject, only if $section is 'new'
+        * @param $edittime String: revision timestamp or null to use the current revision
         * @return string Complete article text, or null if error
         */
        public function replaceSection( $section, $text, $summary = '', $edittime = null ) {
                wfProfileIn( __METHOD__ );
+
                if ( strval( $section ) == '' ) {
                        // Whole-page edit; let the whole text through
                } else {
@@ -1723,11 +1902,13 @@ class Article {
                                $dbw = wfGetDB( DB_MASTER );
                                $rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
                        }
+
                        if ( !$rev ) {
                                wfDebug( "Article::replaceSection asked for bogus section (page: " .
                                        $this->getId() . "; section: $section; edittime: $edittime)\n" );
                                return null;
                        }
+
                        $oldtext = $rev->getText();
 
                        if ( $section == 'new' ) {
@@ -1739,9 +1920,11 @@ class Article {
                        } else {
                                # Replacing an existing section; roll out the big guns
                                global $wgParser;
+
                                $text = $wgParser->replaceSection( $oldtext, $section, $text );
                        }
                }
+
                wfProfileOut( __METHOD__ );
                return $text;
        }
@@ -1760,7 +1943,6 @@ class Article {
                if ( $comment && $summary != "" ) {
                        $text = wfMsgForContent( 'newsectionheaderdefaultlevel', $summary ) . "\n\n" . $text;
                }
-
                $this->doEdit( $text, $summary, $flags );
 
                $dbw = wfGetDB( DB_MASTER );
@@ -1789,6 +1971,7 @@ class Article {
                        ( $forceBot ? EDIT_FORCE_BOT : 0 );
 
                $status = $this->doEdit( $text, $summary, $flags );
+
                if ( !$status->isOK() ) {
                        return false;
                }
@@ -1815,6 +1998,23 @@ class Article {
                return true;
        }
 
+       /**
+        * Check flags and add EDIT_NEW or EDIT_UPDATE to them as needed.
+        * @param $flags Int
+        * @return Int updated $flags
+        */
+       function checkFlags( $flags ) {
+               if ( !( $flags & EDIT_NEW ) && !( $flags & EDIT_UPDATE ) ) {
+                       if ( $this->mTitle->getArticleID() ) {
+                               $flags |= EDIT_UPDATE;
+                       } else {
+                               $flags |= EDIT_NEW;
+                       }
+               }
+
+               return $flags;
+       }
+
        /**
         * Article::doEdit()
         *
@@ -1869,7 +2069,7 @@ class Article {
                global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries;
 
                # Low-level sanity check
-               if ( $this->mTitle->getText() == '' ) {
+               if ( $this->mTitle->getText() === '' ) {
                        throw new MWException( 'Something is trying to edit an article with an empty title' );
                }
 
@@ -1881,23 +2081,18 @@ class Article {
                # Load $this->mTitle->getArticleID() and $this->mLatest if it's not already
                $this->loadPageData();
 
-               if ( !( $flags & EDIT_NEW ) && !( $flags & EDIT_UPDATE ) ) {
-                       $aid = $this->mTitle->getArticleID();
-                       if ( $aid ) {
-                               $flags |= EDIT_UPDATE;
-                       } else {
-                               $flags |= EDIT_NEW;
-                       }
-               }
-
+               $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" );
                        wfProfileOut( __METHOD__ );
+
                        if ( $status->isOK() ) {
                                $status->fatal( 'edit-hook-aborted' );
                        }
+
                        return $status;
                }
 
@@ -1924,6 +2119,7 @@ class Article {
                if ( $flags & EDIT_UPDATE ) {
                        # Update article, but only if changed.
                        $status->value['new'] = false;
+
                        # Make sure the revision is either completely inserted or not inserted at all
                        if ( !$wgDBtransactions ) {
                                $userAbort = ignore_user_abort( true );
@@ -1942,6 +2138,7 @@ class Article {
                                        # Article gone missing
                                        wfDebug( __METHOD__ . ": EDIT_UPDATE specified but article doesn't exist\n" );
                                        $status->fatal( 'edit-gone-missing' );
+
                                        wfProfileOut( __METHOD__ );
                                        return $status;
                                }
@@ -1954,7 +2151,7 @@ class Article {
                                        'parent_id'  => $this->mLatest,
                                        'user'       => $user->getId(),
                                        'user_text'  => $user->getName(),
-                                       ) );
+                               ) );
 
                                $dbw->begin();
                                $revisionId = $revision->insertOn( $dbw );
@@ -1971,10 +2168,12 @@ class Article {
                                if ( !$ok ) {
                                        /* Belated edit conflict! Run away!! */
                                        $status->fatal( 'edit-conflict' );
+
                                        # Delete the invalid revision if the DB is not transactional
                                        if ( !$wgDBtransactions ) {
                                                $dbw->delete( 'revision', array( 'rev_id' => $revisionId ), __METHOD__ );
                                        }
+
                                        $revisionId = 0;
                                        $dbw->rollback();
                                } else {
@@ -1989,6 +2188,7 @@ class Article {
                                                        $this->mLatest, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
                                                        $revisionId, $patrolled
                                                );
+
                                                # Log auto-patrolled edits
                                                if ( $patrolled ) {
                                                        PatrolLog::record( $rc, true );
@@ -2010,6 +2210,7 @@ class Article {
                        if ( !$wgDBtransactions ) {
                                ignore_user_abort( $userAbort );
                        }
+
                        // Now that ignore_user_abort is restored, we can respond to fatal errors
                        if ( !$status->isOK() ) {
                                wfProfileOut( __METHOD__ );
@@ -2040,6 +2241,7 @@ class Article {
                        if ( $newid === false ) {
                                $dbw->rollback();
                                $status->fatal( 'edit-already-exists' );
+
                                wfProfileOut( __METHOD__ );
                                return $status;
                        }
@@ -2061,14 +2263,17 @@ class Article {
                        $this->updateRevisionOn( $dbw, $revision, 0 );
 
                        wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $user ) );
+
                        # Update recentchanges
                        if ( !( $flags & EDIT_SUPPRESS_RC ) ) {
                                global $wgUseRCPatrol, $wgUseNPPatrol;
+
                                # Mark as patrolled if the user can do so
                                $patrolled = ( $wgUseRCPatrol || $wgUseNPPatrol ) && $this->mTitle->userCan( 'autopatrol' );
                                # Add RC row to the DB
                                $rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot,
                                        '', strlen( $text ), $revisionId, $patrolled );
+
                                # Log auto-patrolled edits
                                if ( $patrolled ) {
                                        PatrolLog::record( $rc, true );
@@ -2120,13 +2325,15 @@ class Article {
         */
        public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
                global $wgOut;
+
                if ( $noRedir ) {
                        $query = 'redirect=no';
                        if ( $extraQuery )
-                               $query .= "&$query";
+                               $query .= "&$extraQuery";
                } else {
                        $query = $extraQuery;
                }
+
                $wgOut->redirect( $this->mTitle->getFullURL( $query ) . $sectionAnchor );
        }
 
@@ -2134,12 +2341,20 @@ class Article {
         * Mark this particular edit/page as patrolled
         */
        public function markpatrolled() {
-               global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUseNPPatrol, $wgUser;
+               global $wgOut, $wgUser, $wgRequest;
+
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
 
                # If we haven't been given an rc_id value, we can't do anything
                $rcid = (int) $wgRequest->getVal( 'rcid' );
+
+               if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) {
+                       $wgOut->showErrorPage( 'sessionfailure-title', 'sessionfailure' );
+                       return;
+               }
+
                $rc = RecentChange::newFromId( $rcid );
+
                if ( is_null( $rc ) ) {
                        $wgOut->showErrorPage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
                        return;
@@ -2149,11 +2364,11 @@ class Article {
                $returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges';
                $return = SpecialPage::getTitleFor( $returnto );
 
-               $dbw = wfGetDB( DB_MASTER );
                $errors = $rc->doMarkPatrolled();
 
                if ( in_array( array( 'rcpatroldisabled' ), $errors ) ) {
                        $wgOut->showErrorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
+
                        return;
                }
 
@@ -2166,11 +2381,13 @@ class Article {
                        $wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) );
                        $wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
                        $wgOut->returnToMain( false, $return );
+
                        return;
                }
 
                if ( !empty( $errors ) ) {
                        $wgOut->showPermissionsErrorPage( $errors );
+
                        return;
                }
 
@@ -2185,19 +2402,23 @@ class Article {
         */
        public function watch() {
                global $wgUser, $wgOut;
+
                if ( $wgUser->isAnon() ) {
                        $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
                        return;
                }
+
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
                        return;
                }
+
                if ( $this->doWatch() ) {
                        $wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
                        $wgOut->setRobotPolicy( 'noindex,nofollow' );
                        $wgOut->addWikiMsg( 'addedwatchtext', $this->mTitle->getPrefixedText() );
                }
+
                $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
        }
 
@@ -2207,13 +2428,16 @@ class Article {
         */
        public function doWatch() {
                global $wgUser;
+
                if ( $wgUser->isAnon() ) {
                        return false;
                }
+
                if ( wfRunHooks( 'WatchArticle', array( &$wgUser, &$this ) ) ) {
                        $wgUser->addWatch( $this->mTitle );
                        return wfRunHooks( 'WatchArticleComplete', array( &$wgUser, &$this ) );
                }
+
                return false;
        }
 
@@ -2222,19 +2446,23 @@ class Article {
         */
        public function unwatch() {
                global $wgUser, $wgOut;
+
                if ( $wgUser->isAnon() ) {
                        $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
                        return;
                }
+
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
                        return;
                }
+
                if ( $this->doUnwatch() ) {
                        $wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
                        $wgOut->setRobotPolicy( 'noindex,nofollow' );
                        $wgOut->addWikiMsg( 'removedwatchtext', $this->mTitle->getPrefixedText() );
                }
+
                $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
        }
 
@@ -2244,13 +2472,16 @@ class Article {
         */
        public function doUnwatch() {
                global $wgUser;
+
                if ( $wgUser->isAnon() ) {
                        return false;
                }
+
                if ( wfRunHooks( 'UnwatchArticle', array( &$wgUser, &$this ) ) ) {
                        $wgUser->removeWatch( $this->mTitle );
                        return wfRunHooks( 'UnwatchArticleComplete', array( &$wgUser, &$this ) );
                }
+
                return false;
        }
 
@@ -2284,6 +2515,7 @@ class Article {
                $restrictionTypes = $this->mTitle->getRestrictionTypes();
 
                $id = $this->mTitle->getArticleID();
+
                if ( $id <= 0 ) {
                        wfDebug( "updateRestrictions failed: $id <= 0\n" );
                        return false;
@@ -2311,6 +2543,7 @@ class Article {
                $current = array();
                $updated = Article::flattenRestrictions( $limit );
                $changed = false;
+
                foreach ( $restrictionTypes as $action ) {
                        if ( isset( $expiry[$action] ) ) {
                                # Get current restrictions on $action
@@ -2318,6 +2551,7 @@ class Article {
                                $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".
@@ -2336,36 +2570,42 @@ class Article {
                # If nothing's changed, do nothing
                if ( $changed ) {
                        if ( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) {
-
                                $dbw = wfGetDB( DB_MASTER );
 
                                # Prepare a null revision to be added to the history
                                $modified = $current != '' && $protect;
+
                                if ( $protect ) {
                                        $comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle';
                                } else {
                                        $comment_type = 'unprotectedarticle';
                                }
+
                                $comment = $wgContLang->ucfirst( wfMsgForContent( $comment_type, $this->mTitle->getPrefixedText() ) );
 
                                # Only restrictions with the 'protect' right can cascade...
                                # Otherwise, people who cannot normally protect can "protect" pages via transclusion
                                $editrestriction = isset( $limit['edit'] ) ? array( $limit['edit'] ) : $this->mTitle->getRestrictions( 'edit' );
+
                                # The schema allows multiple restrictions
-                               if ( !in_array( 'protect', $editrestriction ) && !in_array( 'sysop', $editrestriction ) )
+                               if ( !in_array( 'protect', $editrestriction ) && !in_array( 'sysop', $editrestriction ) ) {
                                        $cascade = false;
+                               }
+
                                $cascade_description = '';
+
                                if ( $cascade ) {
                                        $cascade_description = ' [' . wfMsgForContent( 'protect-summary-cascade' ) . ']';
                                }
 
-                               if ( $reason )
+                               if ( $reason ) {
                                        $comment .= ": $reason";
+                               }
 
                                $editComment = $comment;
                                $encodedExpiry = array();
                                $protect_description = '';
-                               foreach ( $limit as $action => $restrictions  ) {
+                               foreach ( $limit as $action => $restrictions ) {
                                        if ( !isset( $expiry[$action] ) )
                                                $expiry[$action] = 'infinite';
 
@@ -2380,15 +2620,20 @@ class Article {
                                                } else {
                                                        $protect_description .= wfMsgForContent( 'protect-expiry-indefinite' );
                                                }
+
                                                $protect_description .= ') ';
                                        }
                                }
                                $protect_description = trim( $protect_description );
 
-                               if ( $protect_description && $protect )
+                               if ( $protect_description && $protect ) {
                                        $editComment .= " ($protect_description)";
-                               if ( $cascade )
+                               }
+
+                               if ( $cascade ) {
                                        $editComment .= "$cascade_description";
+                               }
+
                                # Update restrictions table
                                foreach ( $limit as $action => $restrictions ) {
                                        if ( $restrictions != '' ) {
@@ -2397,7 +2642,10 @@ class Article {
                                                                'pr_type' => $action,
                                                                'pr_level' => $restrictions,
                                                                'pr_cascade' => ( $cascade && $action == 'edit' ) ? 1 : 0,
-                                                               'pr_expiry' => $encodedExpiry[$action] ), __METHOD__  );
+                                                               'pr_expiry' => $encodedExpiry[$action]
+                                                       ),
+                                                       __METHOD__
+                                               );
                                        } else {
                                                $dbw->delete( 'page_restrictions', array( 'pr_page' => $id,
                                                        'pr_type' => $action ), __METHOD__ );
@@ -2431,7 +2679,6 @@ class Article {
                                } else {
                                        $log->addEntry( 'unprotect', $this->mTitle, $reason );
                                }
-
                        } # End hook
                } # End "changed" check
 
@@ -2448,35 +2695,46 @@ class Article {
                if ( !is_array( $limit ) ) {
                        throw new MWException( 'Article::flattenRestrictions given non-array restriction set' );
                }
+
                $bits = array();
                ksort( $limit );
+
                foreach ( $limit as $action => $restrictions ) {
                        if ( $restrictions != '' ) {
                                $bits[] = "$action=$restrictions";
                        }
                }
+
                return implode( ':', $bits );
        }
 
        /**
         * Auto-generates a deletion reason
+        *
         * @param &$hasHistory Boolean: whether the page has a history
+        * @return mixed String containing deletion reason or empty string, or boolean false
+        *    if no revision occurred
         */
        public function generateReason( &$hasHistory ) {
                global $wgContLang;
+
                $dbw = wfGetDB( DB_MASTER );
                // Get the last revision
                $rev = Revision::newFromTitle( $this->mTitle );
-               if ( is_null( $rev ) )
+
+               if ( is_null( $rev ) ) {
                        return false;
+               }
 
                // Get the article's contents
                $contents = $rev->getText();
                $blank = false;
+
                // If the page is blank, use the text from the previous revision,
                // which can only be blank if there's a move/import/protect dummy revision involved
                if ( $contents == '' ) {
                        $prev = $rev->getPrevious();
+
                        if ( $prev )    {
                                $contents = $prev->getText();
                                $blank = true;
@@ -2490,21 +2748,27 @@ class Article {
                        __METHOD__,
                        array( 'LIMIT' => 20 )
                );
-               if ( $res === false )
+
+               if ( $res === false ) {
                        // This page has no revisions, which is very weird
                        return false;
+               }
 
                $hasHistory = ( $res->numRows() > 1 );
                $row = $dbw->fetchObject( $res );
-               $onlyAuthor = $row->rev_user_text;
-               // Try to find a second contributor
-               foreach ( $res as $row ) {
-                       if ( $row->rev_user_text != $onlyAuthor ) {
-                               $onlyAuthor = false;
-                               break;
+
+               if ( $row ) { // $row is false if the only contributor is hidden
+                       $onlyAuthor = $row->rev_user_text;
+                       // Try to find a second contributor
+                       foreach ( $res as $row ) {
+                               if ( $row->rev_user_text != $onlyAuthor ) { // Bug 22999
+                                       $onlyAuthor = false;
+                                       break;
+                               }
                        }
+               } else {
+                       $onlyAuthor = false;
                }
-               $dbw->freeResult( $res );
 
                // Generate the summary with a '$1' placeholder
                if ( $blank ) {
@@ -2512,10 +2776,11 @@ class Article {
                        // blank. It's just not our lucky day
                        $reason = wfMsgForContent( 'exbeforeblank', '$1' );
                } else {
-                       if ( $onlyAuthor )
+                       if ( $onlyAuthor ) {
                                $reason = wfMsgForContent( 'excontentauthor', '$1', $onlyAuthor );
-                       else
+                       } else {
                                $reason = wfMsgForContent( 'excontent', '$1' );
+                       }
                }
 
                if ( $reason == '-' ) {
@@ -2533,6 +2798,7 @@ class Article {
                $contents = preg_replace( '/\[\[([^\]]*)\]?$/', '$1', $contents );
                // Now replace the '$1' placeholder
                $reason = str_replace( '$1', $contents, $reason );
+
                return $reason;
        }
 
@@ -2557,6 +2823,7 @@ class Article {
                } elseif ( $reason == 'other' ) {
                        $reason = $this->DeleteReason;
                }
+
                # Flag to hide all contents of the archived revisions
                $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed( 'suppressrevision' );
 
@@ -2565,6 +2832,7 @@ class Article {
                # Read-only check...
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
+
                        return;
                }
 
@@ -2573,6 +2841,7 @@ class Article {
 
                if ( count( $permission_errors ) > 0 ) {
                        $wgOut->showPermissionsErrorPage( $permission_errors );
+
                        return;
                }
 
@@ -2596,6 +2865,7 @@ class Article {
                                'delete',
                                $this->mTitle->getPrefixedText()
                        );
+
                        return;
                }
 
@@ -2603,38 +2873,47 @@ class Article {
                $bigHistory = $this->isBigDeletion();
                if ( $bigHistory && !$this->mTitle->userCan( 'bigdelete' ) ) {
                        global $wgLang, $wgDeleteRevisionsLimit;
-                       $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n",
+
+                       $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n",
                                array( 'delete-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) );
+
                        return;
                }
 
                if ( $confirm ) {
                        $this->doDelete( $reason, $suppress );
+
                        if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) {
                                $this->doWatch();
                        } elseif ( $this->mTitle->userIsWatching() ) {
                                $this->doUnwatch();
                        }
+
                        return;
                }
 
                // Generate deletion reason
                $hasHistory = false;
-               if ( !$reason ) $reason = $this->generateReason( $hasHistory );
+               if ( !$reason ) {
+                       $reason = $this->generateReason( $hasHistory );
+               }
 
                // If the page has a history, insert a warning
                if ( $hasHistory && !$confirm ) {
                        global $wgLang;
+
                        $skin = $wgUser->getSkin();
                        $revisions = $this->estimateRevisionCount();
+                       //FIXME: lego
                        $wgOut->addHTML( '<strong class="mw-delete-warning-revisions">' .
                                wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) .
                                wfMsgHtml( 'word-separator' ) . $skin->historyLink() .
                                '</strong>'
                        );
+
                        if ( $bigHistory ) {
                                global $wgDeleteRevisionsLimit;
-                               $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n",
+                               $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n",
                                        array( 'delete-warning-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) );
                        }
                }
@@ -2647,10 +2926,13 @@ class Article {
         */
        public function isBigDeletion() {
                global $wgDeleteRevisionsLimit;
+
                if ( $wgDeleteRevisionsLimit ) {
                        $revCount = $this->estimateRevisionCount();
+
                        return $revCount > $wgDeleteRevisionsLimit;
                }
+
                return false;
        }
 
@@ -2659,6 +2941,7 @@ class Article {
         */
        public function estimateRevisionCount() {
                $dbr = wfGetDB( DB_SLAVE );
+
                // For an exact count...
                // return $dbr->selectField( 'revision', 'COUNT(*)',
                //      array( 'rev_page' => $this->getId() ), __METHOD__ );
@@ -2678,6 +2961,7 @@ class Article {
                // 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' ),
@@ -2690,11 +2974,14 @@ class Article {
                                        'LIMIT' => $num
                                ) )
                        );
+
                        if ( !$res ) {
                                wfProfileOut( __METHOD__ );
                                return array();
                        }
+
                        $row = $db->fetchObject( $res );
+
                        if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
                                $db = wfGetDB( DB_MASTER );
                                $continue--;
@@ -2704,15 +2991,18 @@ class Article {
                } while ( $continue );
 
                $authors = array( $row->rev_user_text );
+
                while ( $row = $db->fetchObject( $res ) ) {
                        $authors[] = $row->rev_user_text;
                }
+
                wfProfileOut( __METHOD__ );
                return $authors;
        }
 
        /**
         * Output deletion confirmation dialog
+        * FIXME: Move to another file?
         * @param $reason String: prefilled reason
         */
        public function confirmDelete( $reason ) {
@@ -2720,13 +3010,7 @@ class Article {
 
                wfDebug( "Article::confirmDelete\n" );
 
-               $deleteBackLink = $wgUser->getSkin()->link(
-                       $this->mTitle,
-                       null,
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
-               );
+               $deleteBackLink = $wgUser->getSkin()->linkKnown( $this->mTitle );
                $wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $deleteBackLink ) );
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
                $wgOut->addWikiMsg( 'confirmdeletetext' );
@@ -2775,7 +3059,8 @@ class Article {
                                ) ) .
                                "</td>
                        </tr>";
-               # Dissalow watching is user is not logged in
+
+               # Disallow watching if user is not logged in
                if ( $wgUser->isLoggedIn() ) {
                        $form .= "
                        <tr>
@@ -2786,6 +3071,7 @@ class Article {
                                "</td>
                        </tr>";
                }
+
                $form .= "
                        $suppress
                        <tr>
@@ -2814,9 +3100,7 @@ class Article {
 
                $wgOut->addHTML( $form );
                $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
-               LogEventsList::showLogExtract(
-                       $wgOut,
-                       'delete',
+               LogEventsList::showLogExtract( $wgOut, 'delete',
                        $this->mTitle->getPrefixedText()
                );
        }
@@ -2826,6 +3110,7 @@ class Article {
         */
        public function doDelete( $reason, $suppress = false ) {
                global $wgOut, $wgUser;
+
                $id = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
 
                $error = '';
@@ -2851,7 +3136,9 @@ class Article {
                                                wfMsgExt( 'cannotdelete', array( 'parse' ), $this->mTitle->getPrefixedText() )
                                        )
                                );
+
                                $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+
                                LogEventsList::showLogExtract(
                                        $wgOut,
                                        'delete',
@@ -2866,20 +3153,27 @@ class Article {
        /**
         * Back-end article deletion
         * Deletes the article with database consistency, writes logs, purges caches
-        * Returns success
+        *
+        * @param $reason string delete reason for deletion log
+        * @param suppress bitfield
+        *      Revision::DELETED_TEXT
+        *      Revision::DELETED_COMMENT
+        *      Revision::DELETED_USER
+        *      Revision::DELETED_RESTRICTED
+        * @param $id int article ID
+        * @param $commit boolean defaults to true, triggers transaction end
+        * @return boolean true if successful
         */
        public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true ) {
-               global $wgUseSquid, $wgDeferredUpdateList;
-               global $wgUseTrackbacks;
+               global $wgDeferredUpdateList, $wgUseTrackbacks;
 
                wfDebug( __METHOD__ . "\n" );
 
                $dbw = wfGetDB( DB_MASTER );
-               $ns = $this->mTitle->getNamespace();
                $t = $this->mTitle->getDBkey();
                $id = $id ? $id : $this->mTitle->getArticleID( GAID_FOR_UPDATE );
 
-               if ( $t == '' || $id == 0 ) {
+               if ( $t === '' || $id == 0 ) {
                        return false;
                }
 
@@ -2937,6 +3231,7 @@ class Article {
                # Now that it's safely backed up, delete it
                $dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__ );
                $ok = ( $dbw->affectedRows() > 0 ); // getArticleId() uses slave, could be laggy
+
                if ( !$ok ) {
                        $dbw->rollback();
                        return false;
@@ -2945,9 +3240,11 @@ class Article {
                # Fix category table counts
                $cats = array();
                $res = $dbw->select( 'categorylinks', 'cl_to', array( 'cl_from' => $id ), __METHOD__ );
+
                foreach ( $res as $row ) {
                        $cats [] = $row->cl_to;
                }
+
                $this->updateCategoryCounts( array(), $cats );
 
                # If using cascading deletes, we can skip some explicit deletes
@@ -3023,6 +3320,7 @@ class Article {
         */
        public function doRollback( $fromP, $summary, $token, $bot, &$resultDetails ) {
                global $wgUser;
+
                $resultDetails = null;
 
                # Check permissions
@@ -3030,15 +3328,18 @@ class Article {
                $rollbackErrors = $this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser );
                $errors = array_merge( $editErrors, wfArrayDiff2( $rollbackErrors, $editErrors ) );
 
-               if ( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) )
+               if ( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) ) {
                        $errors[] = array( 'sessionfailure' );
+               }
 
                if ( $wgUser->pingLimiter( 'rollback' ) || $wgUser->pingLimiter() ) {
                        $errors[] = array( 'actionthrottledtext' );
                }
+
                # If there were errors, bail out now
-               if ( !empty( $errors ) )
+               if ( !empty( $errors ) ) {
                        return $errors;
+               }
 
                return $this->commitRollback( $fromP, $summary, $bot, $resultDetails );
        }
@@ -3054,6 +3355,7 @@ class Article {
         */
        public function commitRollback( $fromP, $summary, $bot, &$resultDetails ) {
                global $wgUseRCPatrol, $wgUser, $wgLang;
+
                $dbw = wfGetDB( DB_MASTER );
 
                if ( wfReadOnly() ) {
@@ -3089,12 +3391,12 @@ class Article {
                                "rev_user != {$user} OR rev_user_text != {$user_text}"
                        ), __METHOD__,
                        array( 'USE INDEX' => 'page_timestamp',
-                               'ORDER BY'  => 'rev_timestamp DESC' )
+                               'ORDER BY' => 'rev_timestamp DESC' )
                        );
                if ( $s === false ) {
                        # No one else ever edited this page
                        return array( array( 'cantrollback' ) );
-               } else if ( $s->rev_deleted & REVISION::DELETED_TEXT || $s->rev_deleted & REVISION::DELETED_USER ) {
+               } else if ( $s->rev_deleted & Revision::DELETED_TEXT || $s->rev_deleted & Revision::DELETED_USER ) {
                        # Only admins can see this text
                        return array( array( 'notvisiblerev' ) );
                }
@@ -3104,6 +3406,7 @@ class Article {
                        # Mark all reverted edits as bot
                        $set['rc_bot'] = 1;
                }
+
                if ( $wgUseRCPatrol ) {
                        # Mark all reverted edits as patrolled
                        $set['rc_patrolled'] = 1;
@@ -3140,11 +3443,14 @@ class Article {
                # Save
                $flags = EDIT_UPDATE;
 
-               if ( $wgUser->isAllowed( 'minoredit' ) )
+               if ( $wgUser->isAllowed( 'minoredit' ) ) {
                        $flags |= EDIT_MINOR;
+               }
 
-               if ( $bot && ( $wgUser->isAllowed( 'markbotedits' ) || $wgUser->isAllowed( 'bot' ) ) )
+               if ( $bot && ( $wgUser->isAllowed( 'markbotedits' ) || $wgUser->isAllowed( 'bot' ) ) ) {
                        $flags |= EDIT_FORCE_BOT;
+               }
+
                # Actually store the edit
                $status = $this->doEdit( $target->getText(), $summary, $flags, $target->getId() );
                if ( !empty( $status->value['revision'] ) ) {
@@ -3161,6 +3467,7 @@ class Article {
                        'target'  => $target,
                        'newid'   => $revId
                );
+
                return array();
        }
 
@@ -3168,7 +3475,8 @@ class Article {
         * User interface for rollback operations
         */
        public function rollback() {
-               global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
+               global $wgUser, $wgOut, $wgRequest;
+
                $details = null;
 
                $result = $this->doRollback(
@@ -3183,26 +3491,31 @@ class Article {
                        $wgOut->rateLimited();
                        return;
                }
+
                if ( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ) {
                        $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
                        $errArray = $result[0];
                        $errMsg = array_shift( $errArray );
                        $wgOut->addWikiMsgArray( $errMsg, $errArray );
+
                        if ( isset( $details['current'] ) ) {
                                $current = $details['current'];
+
                                if ( $current->getComment() != '' ) {
                                        $wgOut->addWikiMsgArray( 'editcomment', array(
                                                $wgUser->getSkin()->formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
                                }
                        }
+
                        return;
                }
+
                # Display permissions errors before read-only message -- there's no
                # point in misleading the user into thinking the inability to rollback
                # is only temporary.
                if ( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) {
-                       # array_diff is completely broken for arrays of arrays, sigh.  Re-
-                       # move any 'readonlytext' error manually.
+                       # array_diff is completely broken for arrays of arrays, sigh.
+                       # Remove any 'readonlytext' error manually.
                        $out = array();
                        foreach ( $result as $error ) {
                                if ( $error != array( 'readonlytext' ) ) {
@@ -3210,10 +3523,13 @@ class Article {
                                }
                        }
                        $wgOut->showPermissionsErrorPage( $out );
+
                        return;
                }
+
                if ( $result == array( array( 'readonlytext' ) ) ) {
                        $wgOut->readOnlyPage();
+
                        return;
                }
 
@@ -3222,12 +3538,14 @@ class Article {
                $newId = $details['newid'];
                $wgOut->setPageTitle( wfMsg( 'actioncomplete' ) );
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
+
                if ( $current->getUserText() === '' ) {
                        $old = wfMsg( 'rev-deleted-user' );
                } else {
                        $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
                                . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
                }
+
                $new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
                        . $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
                $wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
@@ -3239,7 +3557,6 @@ class Article {
                }
        }
 
-
        /**
         * Do standard deferred updates after page view
         */
@@ -3248,12 +3565,14 @@ class Article {
                if ( wfReadOnly() ) {
                        return;
                }
+
                # Don't update page view counters on views from bot users (bug 14044)
                if ( !$wgDisableCounters && !$wgUser->isAllowed( 'bot' ) && $this->getID() ) {
                        Article::incViewCount( $this->getID() );
                        $u = new SiteStatsUpdate( 1, 0, 0 );
                        array_push( $wgDeferredUpdateList, $u );
                }
+
                # Update newtalk / watchlist notification status
                $wgUser->clearNotification( $this->mTitle );
        }
@@ -3267,15 +3586,19 @@ class Article {
                        // Already prepared
                        return $this->mPreparedEdit;
                }
+
                global $wgParser;
+
                $edit = (object)array();
                $edit->revid = $revid;
                $edit->newText = $text;
                $edit->pst = $this->preSaveTransform( $text );
-               $options = $this->getParserOptions();
-               $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $options, true, true, $revid );
+               $edit->popts = clone $this->getParserOptions();
+               $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $edit->popts, true, true, $revid );
                $edit->oldText = $this->getContent();
+
                $this->mPreparedEdit = $edit;
+
                return $edit;
        }
 
@@ -3310,9 +3633,8 @@ class Article {
 
                # Save it to the parser cache
                if ( $wgEnableParserCache ) {
-                       $popts = $this->getParserOptions();
                        $parserCache = ParserCache::singleton();
-                       $parserCache->save( $editInfo->output, $this, $popts );
+                       $parserCache->save( $editInfo->output, $this, $editInfo->popts );
                }
 
                # Update the links tables
@@ -3326,10 +3648,12 @@ class Article {
                                // Flush old entries from the `recentchanges` table; we do this on
                                // random requests so as to avoid an increase in writes for no good reason
                                global $wgRCMaxAge;
+
                                $dbw = wfGetDB( DB_MASTER );
                                $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
                                $recentchanges = $dbw->tableName( 'recentchanges' );
                                $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'";
+
                                $dbw->query( $sql );
                        }
                }
@@ -3353,7 +3677,8 @@ class Article {
                # load of user talk pages and piss people off, nor if it's a minor edit
                # by a properly-flagged bot.
                if ( $this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getTitleKey() && $changed
-                       && !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) ) ) {
+                       && !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) )
+               ) {
                        if ( wfRunHooks( 'ArticleEditUpdateNewTalk', array( &$this ) ) ) {
                                $other = User::newFromName( $shortTitle, false );
                                if ( !$other ) {
@@ -3407,13 +3732,14 @@ class Article {
                        return;
                }
 
-               $unhide = $wgRequest->getInt( 'unhide' ) == 1 &&
-                       $wgUser->matchEditToken( $wgRequest->getVal( 'token' ), $oldid );
+               $unhide = $wgRequest->getInt( 'unhide' ) == 1;
+
                # Cascade unhide param in links for easy deletion browsing
                $extraParams = array();
                if ( $wgRequest->getVal( 'unhide' ) ) {
                        $extraParams['unhide'] = 1;
                }
+
                $revision = Revision::newFromId( $oldid );
 
                $current = ( $oldid == $this->mLatest );
@@ -3493,6 +3819,7 @@ class Article {
                        );
 
                $cdel = '';
+
                // User can delete revisions or view deleted revisions...
                $canHide = $wgUser->isAllowed( 'deleterevision' );
                if ( $canHide || ( $revision->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) {
@@ -3531,6 +3858,7 @@ class Article {
                        "</div>\n" .
                        "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsgExt( 'revision-nav', array( 'escapenoentities', 'parsemag', 'replaceafter' ),
                        $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t";
+
                $wgOut->setSubtitle( $r );
        }
 
@@ -3538,10 +3866,13 @@ class Article {
         * This function is called right before saving the wikitext,
         * so we can do things like signatures and links-in-context.
         *
-        * @param $text String
+        * @param $text String article contents
+        * @return string article contents with altered wikitext markup (signatures
+        *      converted, {{subst:}}, templates, etc.)
         */
        public function preSaveTransform( $text ) {
                global $wgParser, $wgUser;
+
                return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) );
        }
 
@@ -3551,13 +3882,17 @@ class Article {
         * checkLastModified returns true if it has taken care of all
         * output to the client that is necessary for this request.
         * (that is, it has sent a cached version of the page)
+        *
+        * @return boolean true if cached version send, false otherwise
         */
        protected function tryFileCache() {
                static $called = false;
+
                if ( $called ) {
                        wfDebug( "Article::tryFileCache(): called twice!?\n" );
                        return false;
                }
+
                $called = true;
                if ( $this->isFileCacheable() ) {
                        $cache = new HTMLFileCache( $this->mTitle );
@@ -3572,6 +3907,7 @@ class Article {
                } else {
                        wfDebug( "Article::tryFileCache(): not cacheable\n" );
                }
+
                return false;
        }
 
@@ -3581,6 +3917,7 @@ class Article {
         */
        public function isFileCacheable() {
                $cacheable = false;
+
                if ( HTMLFileCache::useFileCache() ) {
                        $cacheable = $this->getID() && !$this->mRedirectedFrom;
                        // Extension may have reason to disable file caching on some pages.
@@ -3588,38 +3925,43 @@ class Article {
                                $cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) );
                        }
                }
+
                return $cacheable;
        }
 
        /**
         * Loads page_touched and returns a value indicating if it should be used
-        *
+        * @return boolean true if not a redirect
         */
        public function checkTouched() {
                if ( !$this->mDataLoaded ) {
                        $this->loadPageData();
                }
+
                return !$this->mIsRedirect;
        }
 
        /**
         * Get the page_touched field
+        * @return string containing GMT timestamp
         */
        public function getTouched() {
-               # Ensure that page data has been loaded
                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;
        }
 
@@ -3645,6 +3987,7 @@ class Article {
                $revision->insertOn( $dbw );
                $this->updateRevisionOn( $dbw, $revision );
 
+               global $wgUser;
                wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $wgUser ) );
 
                wfProfileOut( __METHOD__ );
@@ -3657,15 +4000,18 @@ class Article {
         */
        public static function incViewCount( $id ) {
                $id = intval( $id );
+
                global $wgHitcounterUpdateFreq;
 
                $dbw = wfGetDB( DB_MASTER );
                $pageTable = $dbw->tableName( 'page' );
                $hitcounterTable = $dbw->tableName( 'hitcounter' );
                $acchitsTable = $dbw->tableName( 'acchits' );
+               $dbType = $dbw->getType();
 
-               if ( $wgHitcounterUpdateFreq <= 1 ) {
+               if ( $wgHitcounterUpdateFreq <= 1 || $dbType == 'sqlite' ) {
                        $dbw->query( "UPDATE $pageTable SET page_counter = page_counter + 1 WHERE page_id = $id" );
+
                        return;
                }
 
@@ -3678,17 +4024,18 @@ class Article {
                if ( ( rand() % $checkfreq != 0 ) or ( $dbw->lastErrno() != 0 ) ) {
                        # Most of the time (or on SQL errors), skip row count check
                        $dbw->ignoreErrors( $oldignore );
+
                        return;
                }
 
                $res = $dbw->query( "SELECT COUNT(*) as n FROM $hitcounterTable" );
                $row = $dbw->fetchObject( $res );
                $rown = intval( $row->n );
+
                if ( $rown >= $wgHitcounterUpdateFreq ) {
                        wfProfileIn( 'Article::incViewCount-collect' );
                        $old_user_abort = ignore_user_abort( true );
 
-                       $dbType = $dbw->getType();
                        $dbw->lockTables( array(), array( 'hitcounter' ), __METHOD__, false );
                        $tabletype = $dbType == 'mysql' ? "ENGINE=HEAP " : '';
                        $dbw->query( "CREATE TEMPORARY TABLE $acchitsTable $tabletype AS " .
@@ -3696,11 +4043,11 @@ class Article {
                                'GROUP BY hc_id', __METHOD__ );
                        $dbw->delete( 'hitcounter', '*', __METHOD__ );
                        $dbw->unlockTables( __METHOD__ );
+
                        if ( $dbType == 'mysql' ) {
                                $dbw->query( "UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n " .
                                        'WHERE page_id = hc_id', __METHOD__ );
-                       }
-                       else {
+                       } else {
                                $dbw->query( "UPDATE $pageTable SET page_counter=page_counter + hc_n " .
                                        "FROM $acchitsTable WHERE page_id = hc_id", __METHOD__ );
                        }
@@ -3709,6 +4056,7 @@ class Article {
                        ignore_user_abort( $old_user_abort );
                        wfProfileOut( 'Article::incViewCount-collect' );
                }
+
                $dbw->ignoreErrors( $oldignore );
        }
 
@@ -3730,6 +4078,7 @@ class Article {
                } else {
                        $other = $title->getTalkPage();
                }
+
                $other->invalidateCache();
                $other->purgeSquid();
 
@@ -3738,14 +4087,19 @@ class Article {
                $title->deleteTitleProtection();
        }
 
+       /**
+        * Clears caches when article is deleted
+        */
        public static function onArticleDelete( $title ) {
                global $wgMessageCache;
+
                # Update existence markers on article/talk tabs...
                if ( $title->isTalkPage() ) {
                        $other = $title->getSubjectPage();
                } else {
                        $other = $title->getTalkPage();
                }
+
                $other->invalidateCache();
                $other->purgeSquid();
 
@@ -3759,24 +4113,30 @@ class Article {
                if ( $title->getNamespace() == NS_MEDIAWIKI ) {
                        $wgMessageCache->replace( $title->getDBkey(), false );
                }
+
                # Images
                if ( $title->getNamespace() == NS_FILE ) {
                        $update = new HTMLCacheUpdate( $title, 'imagelinks' );
                        $update->doUpdate();
                }
+
                # User talk pages
                if ( $title->getNamespace() == NS_USER_TALK ) {
                        $user = User::newFromName( $title->getText(), false );
                        $user->setNewtalk( false );
                }
+
                # Image redirects
                RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $title );
        }
 
        /**
         * Purge caches on page update etc
+        *
+        * @param $title Title object
+        * @todo:  verify that $title is always a Title object (and never false or null), add Title hint to parameter $title
         */
-       public static function onArticleEdit( $title, $flags = '' ) {
+       public static function onArticleEdit( $title ) {
                global $wgDeferredUpdateList;
 
                // Invalidate caches of articles which include this page
@@ -3833,6 +4193,7 @@ class Article {
                                        : 'noarticletextanon';
                                $wgOut->addHTML( wfMsgExt( $msg, 'parse' ) );
                        }
+
                        $wgOut->addHTML( '</div>' );
                } else {
                        $dbr = wfGetDB( DB_SLAVE );
@@ -3849,15 +4210,21 @@ class Article {
                        $pageInfo = $this->pageCountInfo( $page );
                        $talkInfo = $this->pageCountInfo( $page->getTalkPage() );
 
+
+                       //FIXME: unescaped messages
                        $wgOut->addHTML( "<ul><li>" . wfMsg( "numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' );
                        $wgOut->addHTML( "<li>" . wfMsg( 'numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>' );
+
                        if ( $talkInfo ) {
                                $wgOut->addHTML( '<li>' . wfMsg( "numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '</li>' );
                        }
+
                        $wgOut->addHTML( '<li>' . wfMsg( "numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '</li>' );
+
                        if ( $talkInfo ) {
                                $wgOut->addHTML( '<li>' . wfMsg( 'numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '</li>' );
                        }
+
                        $wgOut->addHTML( '</ul>' );
                }
        }
@@ -3867,13 +4234,15 @@ class Article {
         * on a given page. If page does not exist, returns false.
         *
         * @param $title Title object
-        * @return array
+        * @return mixed array or boolean false
         */
        public function pageCountInfo( $title ) {
                $id = $title->getArticleId();
+
                if ( $id == 0 ) {
                        return false;
                }
+
                $dbr = wfGetDB( DB_SLAVE );
                $rev_clause = array( 'rev_page' => $id );
                $edits = $dbr->selectField(
@@ -3890,6 +4259,7 @@ class Article {
                        __METHOD__,
                        $this->getSelectOptions()
                );
+
                return array( 'edits' => $edits, 'authors' => $authors );
        }
 
@@ -3902,20 +4272,23 @@ class Article {
        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 );
                        }
                }
-               $dbr->freeResult( $res );
+
                return $result;
        }
 
@@ -3928,21 +4301,24 @@ class Article {
        public function getHiddenCategories() {
                $result = array();
                $id = $this->mTitle->getArticleID();
+
                if ( $id == 0 ) {
                        return array();
                }
+
                $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->select( array( 'categorylinks', 'page_props', 'page' ),
                        array( 'cl_to' ),
                        array( 'cl_from' => $id, 'pp_page=page_id', 'pp_propname' => 'hiddencat',
                                'page_namespace' => NS_CATEGORY, 'page_title=cl_to' ),
                        __METHOD__ );
+
                if ( $res !== false ) {
                        foreach ( $res as $row ) {
                                $result[] = Title::makeTitle( NS_CATEGORY, $row->cl_to );
                        }
                }
-               $dbr->freeResult( $res );
+
                return $result;
        }
 
@@ -3954,11 +4330,14 @@ class Article {
        * @return string An appropriate autosummary, or an empty string.
        */
        public static function getAutosummary( $oldtext, $newtext, $flags ) {
+               global $wgContLang;
+               
                # Decide what kind of autosummary is needed.
 
                # Redirect autosummaries
                $ot = Title::newFromRedirect( $oldtext );
                $rt = Title::newFromRedirect( $newtext );
+
                if ( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) {
                        return wfMsgForContent( 'autoredircomment', $rt->getFullText() );
                }
@@ -3966,10 +4345,11 @@ class Article {
                # New page autosummaries
                if ( $flags & EDIT_NEW && strlen( $newtext ) ) {
                        # If they're making a new article, give its text, truncated, in the summary.
-                       global $wgContLang;
+
                        $truncatedtext = $wgContLang->truncate(
                                str_replace( "\n", ' ', $newtext ),
                                max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new' ) ) ) );
+
                        return wfMsgForContent( 'autosumm-new', $truncatedtext );
                }
 
@@ -3978,10 +4358,11 @@ class Article {
                        return wfMsgForContent( 'autosumm-blank' );
                } elseif ( strlen( $oldtext ) > 10 * strlen( $newtext ) && strlen( $newtext ) < 500 ) {
                        # Removing more than 90% of the article
-                       global $wgContLang;
+
                        $truncatedtext = $wgContLang->truncate(
                                $newtext,
                                max( 0, 200 - strlen( wfMsgForContent( 'autosumm-replace' ) ) ) );
+
                        return wfMsgForContent( 'autosumm-replace', $truncatedtext );
                }
 
@@ -3997,6 +4378,7 @@ class Article {
         *
         * @param $text String
         * @param $cache Boolean
+        * @param $parserOptions mixed ParserOptions object, or boolean false
         */
        public function outputWikiText( $text, $cache = true, $parserOptions = false ) {
                global $wgOut;
@@ -4009,12 +4391,17 @@ class Article {
         * This does all the heavy lifting for outputWikitext, except it returns the parser
         * output instead of sending it straight to $wgOut. Makes things nice and simple for,
         * say, embedding thread pages within a discussion system (LiquidThreads)
+        *
+        * @param $text string
+        * @param $cache boolean
+        * @param $parserOptions parsing options, defaults to false
+        * @return string containing parsed output
         */
        public function getOutputFromWikitext( $text, $cache = true, $parserOptions = false ) {
-               global $wgParser, $wgOut, $wgEnableParserCache, $wgUseFileCache;
+               global $wgParser, $wgEnableParserCache, $wgUseFileCache;
 
                if ( !$parserOptions ) {
-                       $parserOptions = $this->getParserOptions();
+                       $parserOptions = clone $this->getParserOptions();
                }
 
                $time = - wfTime();
@@ -4028,33 +4415,47 @@ class Article {
                                $this->mTitle->getPrefixedDBkey() ) );
                }
 
-               if ( $wgEnableParserCache && $cache && $this && $this->mParserOutput->getCacheTime() != -1 ) {
+               if ( $wgEnableParserCache && $cache && $this->mParserOutput->isCacheable() ) {
                        $parserCache = ParserCache::singleton();
                        $parserCache->save( $this->mParserOutput, $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->mParserOutput->getCacheTime() == -1 || $this->mParserOutput->containsOldMagic() ) {
+               if ( !$this->mParserOutput->isCacheable() || $this->mParserOutput->containsOldMagic() ) {
                        $wgUseFileCache = false;
                }
+
                $this->doCascadeProtectionUpdates( $this->mParserOutput );
+
                return $this->mParserOutput;
        }
 
        /**
         * Get parser options suitable for rendering the primary article wikitext
+        * @return mixed ParserOptions object or boolean false
         */
        public function getParserOptions() {
                global $wgUser;
+
                if ( !$this->mParserOptions ) {
                        $this->mParserOptions = new ParserOptions( $wgUser );
                        $this->mParserOptions->setTidy( true );
                        $this->mParserOptions->enableLimitReport();
                }
-               return $this->mParserOptions;
+
+               // Clone to allow modifications of the return value without affecting 
+               // the cache
+               return clone $this->mParserOptions;
        }
 
+       /**
+        * Updates cascading protections
+        *
+        * @param $parserOutput mixed ParserOptions object, or boolean false
+        **/
+
        protected function doCascadeProtectionUpdates( $parserOutput ) {
                if ( !$this->isCurrent() || wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) {
                        return;
@@ -4076,9 +4477,9 @@ class Article {
                $res = $dbr->select( array( 'templatelinks' ),
                        array( 'tl_namespace', 'tl_title' ),
                        array( 'tl_from' => $id ),
-                       __METHOD__ );
+                       __METHOD__
+               );
 
-               global $wgContLang;
                foreach ( $res as $row ) {
                        $tlTemplates["{$row->tl_namespace}:{$row->tl_title}"] = true;
                }
@@ -4108,7 +4509,6 @@ class Article {
         *
         * @param $added array   The names of categories that were added
         * @param $deleted array The names of categories that were deleted
-        * @return null
         */
        public function updateCategoryCounts( $added, $deleted ) {
                $ns = $this->mTitle->getNamespace();
@@ -4125,7 +4525,9 @@ class Article {
                        # Okay, nothing to do
                        return;
                }
+
                $insertRows = array();
+
                foreach ( $insertCats as $cat ) {
                        $insertRows[] = array(
                                'cat_id' => $dbw->nextSequenceValue( 'category_cat_id_seq' ),
@@ -4136,6 +4538,7 @@ class Article {
 
                $addFields    = array( 'cat_pages = cat_pages + 1' );
                $removeFields = array( 'cat_pages = cat_pages - 1' );
+
                if ( $ns == NS_CATEGORY ) {
                        $addFields[]    = 'cat_subcats = cat_subcats + 1';
                        $removeFields[] = 'cat_subcats = cat_subcats - 1';
@@ -4152,6 +4555,7 @@ class Article {
                                __METHOD__
                        );
                }
+
                if ( $deleted ) {
                        $dbw->update(
                                'category',
@@ -4162,21 +4566,27 @@ class Article {
                }
        }
 
-       /** Lightweight method to get the parser output for a page, checking the parser cache
+       /**
+        * Lightweight method to get the parser output for a page, checking the parser cache
         * and so on. Doesn't consider most of the stuff that Article::view is forced to
         * consider, so it's not appropriate to use there.
+        *
+        * @since 1.16 (r52326) for LiquidThreads
+        * 
+        * @param $oldid mixed integer Revision ID or null
         */
-       function getParserOutput( $oldid = null ) {
-               global $wgEnableParserCache, $wgUser, $wgOut;
+       public function getParserOutput( $oldid = null ) {
+               global $wgEnableParserCache, $wgUser;
 
                // Should the parser cache be used?
                $useParserCache = $wgEnableParserCache &&
-                         intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 &&
-                         $this->exists() &&
-                         $oldid === null;
+                       $wgUser->getStubThreshold() == 0 &&
+                       $this->exists() &&
+                       $oldid === null;
 
                wfDebug( __METHOD__ . ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
-               if ( $wgUser->getOption( 'stubthreshold' ) ) {
+
+               if ( $wgUser->getStubThreshold() ) {
                        wfIncrStats( 'pcache_miss_stub' );
                }
 
@@ -4194,4 +4604,70 @@ class Article {
                        return $parserOutput;
                }
        }
+
+       // Deprecated methods
+       /**
+        * Get the database which should be used for reads
+        *
+        * @return Database
+        * @deprecated - just call wfGetDB( DB_MASTER ) instead
+        */
+       function getDB() {
+               wfDeprecated( __METHOD__ );
+               return wfGetDB( DB_MASTER );
+       }
+
+}
+
+class PoolWorkArticleView extends PoolCounterWork {
+       private $mArticle;
+       
+       function __construct( $article, $key, $useParserCache, $parserOptions ) {
+               parent::__construct( __CLASS__, $key );
+               $this->mArticle = $article;
+               $this->cacheable = $useParserCache;
+               $this->parserOptions = $parserOptions;
+       }
+       
+       function doWork() {
+               return $this->mArticle->doViewParse();
+       }
+       
+       function getCachedWork() {
+               global $wgOut;
+               
+               $parserCache = ParserCache::singleton();
+               $this->mArticle->mParserOutput = $parserCache->get( $this->mArticle, $this->parserOptions );
+
+               if ( $this->mArticle->mParserOutput !== false ) {
+                       wfDebug( __METHOD__ . ": showing contents parsed by someone else\n" );
+                       $wgOut->addParserOutput( $this->mArticle->mParserOutput );
+                       # Ensure that UI elements requiring revision ID have
+                       # the correct version information.
+                       $wgOut->setRevisionId( $this->mArticle->getLatest() );
+                       return true;
+               }
+               return false;
+       }
+       
+       function fallback() {
+               return $this->mArticle->tryDirtyCache();
+       }
+       
+       function error( $status ) {
+               global $wgOut;
+
+               $wgOut->clearHTML(); // for release() errors
+               $wgOut->enableClientCache( false );
+               $wgOut->setRobotPolicy( 'noindex,nofollow' );
+               
+               if ( $status instanceof Status ) {
+                       $errortext = $status->getWikiText( false, 'view-pool-error' );
+               } else {
+                       $errortext = wfMsgNoTrans( 'view-pool-error', '' );
+               }
+               $wgOut->addWikiText( '<div class="errorbox">' . $errortext . '</div>' );
+               
+               return false;
+       }
 }