(bug 5167) Add {{SUBPAGENAME}} variable
[lhc/web/wiklou.git] / includes / Article.php
index 91ab894..bfdb68d 100644 (file)
@@ -49,6 +49,56 @@ class Article {
                $this->mOldId = $oldId;
                $this->clear();
        }
+       
+       /**
+        * Tell the page view functions that this view was redirected
+        * from another page on the wiki.
+        * @param Title $from
+        */
+       function setRedirectedFrom( $from ) {
+               $this->mRedirectedFrom = $from;
+       }
+       
+       /**
+        * @return mixed false, Title of in-wiki target, or string with URL
+        */
+       function followRedirect() {
+               $text = $this->getContent();
+               $rt = Title::newFromRedirect( $text );
+               
+               # process if title object is valid and not special:userlogout
+               if( $rt ) {
+                       if( $rt->getInterwiki() != '' ) {
+                               if( $rt->isLocal() ) {
+                                       // Offsite wikis need an HTTP redirect.
+                                       //
+                                       // This can be hard to reverse and may produce loops,
+                                       // so they may be disabled in the site configuration.
+                                       
+                                       $source = $this->mTitle->getFullURL( 'redirect=no' );
+                                       return $rt->getFullURL( 'rdfrom=' . urlencode( $source ) );
+                               }
+                       } else {
+                               if( $rt->getNamespace() == NS_SPECIAL ) {
+                                       // Gotta hand redirects to special pages differently:
+                                       // Fill the HTTP response "Location" header and ignore
+                                       // the rest of the page we're on.
+                                       //
+                                       // This can be hard to reverse, so they may be disabled.
+                                       
+                                       if( $rt->getNamespace() == NS_SPECIAL && $rt->getText() == 'Userlogout' ) {
+                                               // rolleyes
+                                       } else {
+                                               return $rt->getFullURL();
+                                       }
+                               } 
+                               return $rt;
+                       }
+               }
+               
+               // No or invalid redirect
+               return false;
+       }
 
        /**
         * get the title object of the article
@@ -66,7 +116,8 @@ class Article {
                $this->mContentLoaded = false;
 
                $this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded
-               $this->mRedirectedFrom = $this->mUserText =
+               $this->mRedirectedFrom = null; # Title object if set
+               $this->mUserText =
                $this->mTimestamp = $this->mComment = $this->mFileCache = '';
                $this->mGoodAdjustment = $this->mTotalAdjustment = 0;
                $this->mTouched = '19700101000000';
@@ -77,13 +128,17 @@ class Article {
        }
 
        /**
-        * Note that getContent/loadContent may follow redirects if
-        * not told otherwise, and so may cause a change to mTitle.
+        * Note that getContent/loadContent do not follow redirects anymore.
+        * If you need to fetch redirectable content easily, try
+        * the shortcut in Article::followContent()
+        *
+        * @fixme There are still side-effects in this!
+        *        In general, you should use the Revision class, not Article,
+        *        to fetch text for purposes other than page views.
         *
-        * @param $noredir
         * @return Return the text of this revision
        */
-       function getContent( $noredir ) {
+       function getContent() {
                global $wgRequest, $wgUser, $wgOut;
 
                # Get variables from query string :P
@@ -108,16 +163,16 @@ class Article {
                        }
                        wfProfileOut( $fname );
                        $wgOut->setRobotpolicy( 'noindex,nofollow' );
-                       
+
                        if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
                                $ret = wfMsgWeirdKey ( $this->mTitle->getText() ) ;
                        } else {
                                $ret = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
                        }
-                       
+
                        return "<div class='noarticletext'>$ret</div>";
                } else {
-                       $this->loadContent( $noredir );
+                       $this->loadContent();
                        # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
                        if ( $this->mTitle->getNamespace() == NS_USER_TALK &&
                          $wgUser->isIP($this->mTitle->getText()) &&
@@ -295,14 +350,13 @@ class Article {
        /**
         * Load the revision (including text) into this object
         */
-       function loadContent( $noredir = false ) {
+       function loadContent() {
                global $wgOut, $wgRequest;
 
                if ( $this->mContentLoaded ) return;
 
                # Query variables :P
                $oldid = $this->getOldID();
-               $redirect = $wgRequest->getVal( 'redirect' );
 
                $fname = 'Article::loadContent';
 
@@ -311,10 +365,8 @@ class Article {
 
                $t = $this->mTitle->getPrefixedText();
 
-               $noredir = $noredir || ($wgRequest->getVal( 'redirect' ) == 'no')
-                       || $wgRequest->getCheck( 'rdfrom' );
                $this->mOldId = $oldid;
-               $this->fetchContent( $oldid, $noredir, true );
+               $this->fetchContent( $oldid );
        }
 
 
@@ -372,6 +424,7 @@ class Article {
         * @access private
         */
        function loadPageData( $data ) {
+               $this->mTitle->mArticleID = $data->page_id;
                $this->mTitle->loadRestrictions( $data->page_restrictions );
                $this->mTitle->mRestrictionsLoaded = true;
 
@@ -385,16 +438,15 @@ class Article {
 
        /**
         * Get text of an article from database
+        * Does *NOT* follow redirects.
         * @param int $oldid 0 for whatever the latest revision is
-        * @param bool $noredir Set to false to follow redirects
-        * @param bool $globalTitle Set to true to change the global $wgTitle object when following redirects or other unexpected title changes
         * @return string
         */
-       function fetchContent( $oldid = 0, $noredir = true, $globalTitle = false ) {
+       function fetchContent( $oldid = 0 ) {
                if ( $this->mContentLoaded ) {
                        return $this->mContent;
                }
-               
+
                $dbr =& $this->getDB();
                $fname = 'Article::fetchContent';
 
@@ -404,10 +456,6 @@ class Article {
                if( $oldid ) {
                        $t .= ',oldid='.$oldid;
                }
-               if( isset( $redirect ) ) {
-                       $redirect = ($redirect == 'no') ? 'no' : 'yes';
-                       $t .= ',redirect='.$redirect;
-               }
                $this->mContent = wfMsg( 'missingarticle', $t ) ;
 
                if( $oldid ) {
@@ -439,53 +487,6 @@ class Article {
                        }
                }
 
-               # If we got a redirect, follow it (unless we've been told
-               # not to by either the function parameter or the query
-               if ( !$oldid && !$noredir ) {
-                       $rt = Title::newFromRedirect( $revision->getText() );
-                       # process if title object is valid and not special:userlogout
-                       if ( $rt && ! ( $rt->getNamespace() == NS_SPECIAL && $rt->getText() == 'Userlogout' ) ) {
-                               # Gotta hand redirects to special pages differently:
-                               # Fill the HTTP response "Location" header and ignore
-                               # the rest of the page we're on.
-                               global $wgDisableHardRedirects;
-                               if( $globalTitle && !$wgDisableHardRedirects ) {
-                                       global $wgOut;
-                                       if ( $rt->getInterwiki() != '' && $rt->isLocal() ) {
-                                               $source = $this->mTitle->getFullURL( 'redirect=no' );
-                                               $wgOut->redirect( $rt->getFullURL( 'rdfrom=' . urlencode( $source ) ) ) ;
-                                               return false;
-                                       }
-                                       if ( $rt->getNamespace() == NS_SPECIAL ) {
-                                               $wgOut->redirect( $rt->getFullURL() );
-                                               return false;
-                                       }
-                               }
-                               if( $rt->getInterwiki() == '' ) {
-                                       $redirData = $this->pageDataFromTitle( $dbr, $rt );
-                                       if( $redirData ) {
-                                               $redirRev = Revision::newFromId( $redirData->page_latest );
-                                               if( !is_null( $redirRev ) ) {
-                                                       $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
-                                                       $this->mTitle = $rt;
-                                                       $data = $redirData;
-                                                       $this->loadPageData( $data );
-                                                       $revision = $redirRev;
-                                               }
-                                       }
-                               }
-                       }
-               }
-
-               # if the title's different from expected, update...
-               if( $globalTitle ) {
-                       global $wgTitle;
-                       if( !$this->mTitle->equals( $wgTitle ) ) {
-                               $wgTitle = $this->mTitle;
-                       }
-               }
-
-               # Back to the business at hand...
                $this->mContent   = $revision->getText();
 
                $this->mUser      = $revision->getUser();
@@ -502,19 +503,6 @@ class Article {
                return $this->mContent;
        }
 
-       /**
-        * Gets the article text without using so many damn globals
-        *
-        * Used by maintenance/importLogs.php
-        *
-        * @param int $oldid
-        * @param bool $noredir Whether to follow redirects
-        * @return mixed the content (string) or false on error
-        */
-       function getContentWithoutUsingSoManyDamnGlobals( $oldid = 0, $noredir = false ) {
-               return $this->fetchContent( $oldid, $noredir, false );
-       }
-
        /**
         * Read/write accessor to select FOR UPDATE
         *
@@ -527,10 +515,6 @@ class Article {
        /**
         * Get the database which should be used for reads
         *
-        * This is deprecated, just use wfGetDB() instead
-        *
-        * @deprecated
-        *
         * @return Database
         */
        function &getDB() {
@@ -795,6 +779,30 @@ class Article {
                        wfIncrStats( 'pcache_miss_stub' );
                }
 
+               $wasRedirected = false;
+               if ( isset( $this->mRedirectedFrom ) ) {
+                       // This is an internally redirected page view.
+                       // We'll need a backlink to the source page for navigation.
+                       if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
+                               $sk = $wgUser->getSkin();
+                               $redir = $sk->makeKnownLinkObj( $this->mRedirectedFrom, '', 'redirect=no' );
+                               $s = wfMsg( 'redirectedfrom', $redir );
+                               $wgOut->setSubtitle( $s );
+                               $wasRedirected = true;
+                       }
+               } elseif ( !empty( $rdfrom ) ) {
+                       // This is an externally redirected view, from some other wiki.
+                       // If it was reported from a trusted site, supply a backlink.
+                       global $wgRedirectSources;
+                       if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
+                               $sk = $wgUser->getSkin();
+                               $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
+                               $s = wfMsg( 'redirectedfrom', $redir );
+                               $wgOut->setSubtitle( $s );
+                               $wasRedirected = true;
+                       }
+               }
+               
                $outputDone = false;
                if ( $pcache ) {
                        if ( $wgOut->tryParserCache( $this, $wgUser ) ) {
@@ -802,21 +810,19 @@ class Article {
                        }
                }
                if ( !$outputDone ) {
-                       $text = $this->getContent( false ); # May change mTitle by following a redirect
+                       $text = $this->getContent();
                        if ( $text === false ) {
                                # Failed to load, replace text with error message
                                $t = $this->mTitle->getPrefixedText();
                                if( $oldid ) {
                                        $t .= ',oldid='.$oldid;
+                                       $text = wfMsg( 'missingarticle', $t );
+                               } else {
+                                       $text = wfMsg( 'noarticletext', $t );
                                }
-                               if( isset( $redirect ) ) {
-                                       $redirect = ($redirect == 'no') ? 'no' : 'yes';
-                                       $t .= ',redirect='.$redirect;
-                               }
-                               $text = wfMsg( 'missingarticle', $t );
                        }
 
-                       # Another whitelist check in case oldid or redirects are altering the title
+                       # Another whitelist check in case oldid is altering the title
                        if ( !$this->mTitle->userCanRead() ) {
                                $wgOut->loginToUse();
                                $wgOut->output();
@@ -829,32 +835,6 @@ class Article {
                                $this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
                                $wgOut->setRobotpolicy( 'noindex,follow' );
                        }
-                       $wasRedirected = false;
-                       if ( '' != $this->mRedirectedFrom ) {
-                               if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
-                                       $sk = $wgUser->getSkin();
-                                       $redir = $sk->makeKnownLink( $this->mRedirectedFrom, '', 'redirect=no' );
-                                       $s = wfMsg( 'redirectedfrom', $redir );
-                                       $wgOut->setSubtitle( $s );
-                                       
-                                       // Check the parser cache again, for the target page
-                                       if( $pcache ) {
-                                               if( $wgOut->tryParserCache( $this, $wgUser ) ) {
-                                                       $outputDone = true;
-                                               }
-                                       }
-                                       $wasRedirected = true;
-                               }
-                       } elseif ( !empty( $rdfrom ) ) {
-                               global $wgRedirectSources;
-                               if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
-                                       $sk = $wgUser->getSkin();
-                                       $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
-                                       $s = wfMsg( 'redirectedfrom', $redir );
-                                       $wgOut->setSubtitle( $s );
-                                       $wasRedirected = true;
-                               }
-                       }
                }
                if( !$outputDone ) {
                        /**
@@ -897,7 +877,8 @@ class Article {
                                if( !$this->isCurrent() ) {
                                        $oldEditSectionSetting = $wgOut->mParserOptions->setEditSection( false );
                                }
-                               $wgOut->addWikiText( $text );
+                               # Display content and don't save to parser cache
+                               $wgOut->addPrimaryWikiText( $text, $this, false );
 
                                if( !$this->isCurrent() ) {
                                        $wgOut->mParserOptions->setEditSection( $oldEditSectionSetting );
@@ -996,24 +977,17 @@ class Article {
                $wgOut->setArticleBodyOnly(true);
                $this->view();
        }
-       
-       function purge() {
-               global $wgUser, $wgRequest, $wgOut, $wgUseSquid;
-
-               if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() || ! wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
-                       // Invalidate the cache
-                       $this->mTitle->invalidateCache();
 
-                       if ( $wgUseSquid ) {
-                               // Commit the transaction before the purge is sent
-                               $dbw = wfGetDB( DB_MASTER );
-                               $dbw->immediateCommit();
+       /**
+        * Handle action=purge
+        */
+       function purge() {
+               global $wgUser, $wgRequest, $wgOut;
 
-                               // Send purge
-                               $update = SquidUpdate::newSimplePurge( $this->mTitle );
-                               $update->doUpdate();
+               if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() ) {
+                       if( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
+                               $this->doPurge();
                        }
-                       $this->view();
                } else {
                        $msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
                        $action = $this->mTitle->escapeLocalURL( 'action=purge' );
@@ -1028,6 +1002,26 @@ class Article {
                        $wgOut->addHTML( $msg );
                }
        }
+       
+       /**
+        * Perform the actions of a page purging
+        */
+       function doPurge() {
+               global $wgUseSquid;
+               // Invalidate the cache
+               $this->mTitle->invalidateCache();
+
+               if ( $wgUseSquid ) {
+                       // Commit the transaction before the purge is sent
+                       $dbw = wfGetDB( DB_MASTER );
+                       $dbw->immediateCommit();
+
+                       // Send purge
+                       $update = SquidUpdate::newSimplePurge( $this->mTitle );
+                       $update->doUpdate();
+               }
+               $this->view();
+       }
 
        /**
         * Insert a new empty page record for this article.
@@ -1141,10 +1135,7 @@ class Article {
        }
 
        /**
-        * Theoretically we could defer these whole insert and update
-        * functions for after display, but that's taking a big leap
-        * of faith, and we want to be able to report database
-        * errors at some point.
+        * Insert a new article into the database
         * @access private
         */
        function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
@@ -1159,7 +1150,7 @@ class Article {
                        wfProfileOut( $fname );
                        return false;
                }
-               
+
                $this->mGoodAdjustment = (int)$this->isCountable( $text );
                $this->mTotalAdjustment = 1;
 
@@ -1197,6 +1188,7 @@ class Article {
 
                Article::onArticleCreate( $this->mTitle );
                if(!$suppressRC) {
+                       require_once( 'RecentChange.php' );
                        RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default',
                          '', strlen( $text ), $revisionId );
                }
@@ -1369,7 +1361,7 @@ class Article {
                        $userAbort = ignore_user_abort( true );
                }
 
-               $oldtext = $this->getContent( true );
+               $oldtext = $this->getContent();
                $oldsize = strlen( $oldtext );
                $newsize = strlen( $text );
                $lastRevision = 0;
@@ -1390,7 +1382,7 @@ class Article {
                                'minor_edit' => $isminor,
                                'text'       => $text
                                ) );
-                       
+
                        $dbw->immediateCommit();
                        $dbw->begin();
                        $revisionId = $revision->insertOn( $dbw );
@@ -1404,12 +1396,13 @@ class Article {
                                $dbw->rollback();
                        } else {
                                # Update recentchanges and purge cache and whatnot
+                               require_once( 'RecentChange.php' );
                                $bot = (int)($wgUser->isBot() || $forceBot);
                                RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
                                        $lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
                                        $revisionId );
                                $dbw->commit();
-                               
+
                                // Update caches outside the main transaction
                                Article::onArticleEdit( $this->mTitle );
                        }
@@ -1444,7 +1437,7 @@ class Article {
 
                        $urls = array();
                        # Invalidate caches of all articles using this article as a template
-                       
+
                        # Template namespace
                        # Purge all articles linking here
                        $titles = $this->mTitle->getTemplateLinksTo();
@@ -1488,14 +1481,14 @@ class Article {
 
                $fname = 'Article::showArticle';
                wfProfileIn( $fname );
-               
+
                # Output the redirect
                if( $this->isRedirect( $text ) )
                        $r = 'redirect=no';
                else
                        $r = '';
                $wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
-               
+
                wfProfileOut( $fname );
        }
 
@@ -1506,25 +1499,28 @@ class Article {
                global $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgUseRCPatrol, $wgUser;
                $wgOut->setRobotpolicy( 'noindex,follow' );
 
-               if ( !$wgUseRCPatrol )
-               {
-                       $wgOut->errorpage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
+               # Check RC patrol config. option
+               if( !$wgUseRCPatrol ) {
+                       $wgOut->errorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
                        return;
                }
-               if ( $wgUser->isAnon() )
-               {
+               
+               # Check permissions
+               if( $wgUser->isLoggedIn() ) {
+                       if( !$wgUser->isAllowed( 'patrol' ) ) {
+                               $wgOut->permissionRequired( 'patrol' );
+                               return;
+                       }
+               } else {
                        $wgOut->loginToUse();
                        return;
                }
-               if ( $wgOnlySysopsCanPatrol && !$wgUser->isAllowed('patrol') )
-               {
-                       $wgOut->sysopRequired();
-                       return;
-               }
+               
                $rcid = $wgRequest->getVal( 'rcid' );
                if ( !is_null ( $rcid ) )
                {
                        if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) ) ) {
+                               require_once( 'RecentChange.php' );
                                RecentChange::markPatrolled( $rcid );
                                wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) );
                                $wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
@@ -1617,14 +1613,14 @@ class Article {
                $form = new ProtectionForm( $this );
                $form->show();
        }
-       
+
        /**
         * action=unprotect handler (alias)
         */
        function unprotect() {
                $this->protect();
        }
-       
+
        /**
         * Update the article's restriction field, and leave a log entry.
         *
@@ -1650,7 +1646,7 @@ class Article {
 
                $flat = Article::flattenRestrictions( $limit );
                $protecting = ($flat != '');
-               
+
                if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser,
                        $limit, $reason ) ) ) {
 
@@ -1676,7 +1672,7 @@ class Article {
                }
                return true;
        }
-       
+
        /**
         * Take an array of page restrictions and flatten it to a string
         * suitable for insertion into the page_restrictions field.
@@ -1716,18 +1712,22 @@ class Article {
                                return;
                        }
                } else {
-                       $wgOut->sysopRequired();
+                       $wgOut->permissionRequired( 'delete' );
                        return;
                }
-               
+
                if( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
                        return;
                }
 
-               # Better double-check that it hasn't been deleted yet!
                $wgOut->setPagetitle( wfMsg( 'confirmdelete' ) );
-               if( !$this->mTitle->exists() ) {
+               
+               # Better double-check that it hasn't been deleted yet!
+               $dbw =& wfGetDB( DB_MASTER );
+               $conds = $this->mTitle->pageCond();
+               $latest = $dbw->selectField( 'page', 'page_latest', $conds, $fname );
+               if ( $latest === false ) {
                        $wgOut->fatalError( wfMsg( 'cannotdelete' ) );
                        return;
                }
@@ -1739,38 +1739,30 @@ class Article {
 
                # determine whether this page has earlier revisions
                # and insert a warning if it does
-               # we select the text because it might be useful below
-               $dbr =& wfGetDB( DB_SLAVE );
-               $ns = $this->mTitle->getNamespace();
-               $title = $this->mTitle->getDBkey();
-               $revisions = $dbr->select( array( 'page', 'revision' ),
-                       array( 'rev_id', 'rev_user_text' ),
-                       array(
-                               'page_namespace' => $ns,
-                               'page_title' => $title,
-                               'rev_page = page_id'
-                       ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'rev_timestamp DESC' ) )
-               );
-
-               if( $dbr->numRows( $revisions ) > 1 && !$confirm ) {
+               $maxRevisions = 20;
+               $authors = $this->getLastNAuthors( $maxRevisions, $latest );
+               
+               if( count( $authors ) > 1 && !$confirm ) {
                        $skin=$wgUser->getSkin();
                        $wgOut->addHTML('<b>'.wfMsg('historywarning'));
                        $wgOut->addHTML( $skin->historyLink() .'</b>');
                }
 
-               # Fetch article text
-               $rev = Revision::newFromTitle( $this->mTitle );
-
-               # Fetch name(s) of contributors
-               $rev_name = '';
-               $all_same_user = true;
-               while( $row = $dbr->fetchObject( $revisions ) ) {
-                       if( $rev_name != '' && $rev_name != $row->rev_user_text ) {
-                               $all_same_user = false;
-                       } else {
-                               $rev_name = $row->rev_user_text;
+               # If a single user is responsible for all revisions, find out who they are
+               if ( count( $authors ) == $maxRevisions ) {
+                       // Query bailed out, too many revisions to find out if they're all the same
+                       $authorOfAll = false;
+               } else {
+                       $authorOfAll = reset( $authors );
+                       foreach ( $authors as $author ) {
+                               if ( $authorOfAll != $author ) {
+                                       $authorOfAll = false;
+                                       break;
+                               }
                        }
                }
+               # Fetch article text
+               $rev = Revision::newFromTitle( $this->mTitle );
 
                if( !is_null( $rev ) ) {
                        # if this is a mini-text, we can paste part of it into the deletion reason
@@ -1804,10 +1796,10 @@ class Article {
                                $text = preg_replace( "/[\n\r]/", '', $text );
 
                                if( !$blanked ) {
-                                       if( !$all_same_user ) {
+                                       if( $authorOfAll === false ) {
                                                $reason = wfMsgForContent( 'excontent', $text );
                                        } else {
-                                               $reason = wfMsgForContent( 'excontentauthor', $text, $rev_name );
+                                               $reason = wfMsgForContent( 'excontentauthor', $text, $authorOfAll );
                                        }
                                } else {
                                        $reason = wfMsgForContent( 'exbeforeblank', $text );
@@ -1818,6 +1810,53 @@ class Article {
                return $this->confirmDelete( '', $reason );
        }
 
+       /**
+        * Get the last N authors 
+        * @param int $num Number of revisions to get
+        * @param string $revLatest The latest rev_id, selected from the master (optional)
+        * @return array Array of authors, duplicates not removed
+        */
+       function getLastNAuthors( $num, $revLatest = 0 ) {
+               $fname = 'Article::getLastNAuthors';
+               wfProfileIn( $fname );
+
+               // First try the slave
+               // If that doesn't have the latest revision, try the master
+               $continue = 2;
+               $db =& wfGetDB( DB_SLAVE );
+               do {
+                       $res = $db->select( array( 'page', 'revision' ),
+                               array( 'rev_id', 'rev_user_text' ),
+                               array(
+                                       'page_namespace' => $this->mTitle->getNamespace(),
+                                       'page_title' => $this->mTitle->getDBkey(),
+                                       'rev_page = page_id'
+                               ), $fname, $this->getSelectOptions( array( 
+                                       'ORDER BY' => 'rev_timestamp DESC',
+                                       'LIMIT' => $num
+                               ) )
+                       );
+                       if ( !$res ) {
+                               wfProfileOut( $fname );
+                               return array();
+                       }
+                       $row = $db->fetchObject( $res );
+                       if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
+                               $db =& wfGetDB( DB_MASTER );
+                               $continue--;
+                       } else {
+                               $continue = 0;
+                       }
+               } while ( $continue );
+
+               $authors = array( $row->rev_user_text );
+               while ( $row = $db->fetchObject( $res ) ) {
+                       $authors[] = $row->rev_user_text;
+               }
+               wfProfileOut( $fname );
+               return $authors;
+       }
+       
        /**
         * Output deletion confirmation dialog
         */
@@ -1910,7 +1949,7 @@ class Article {
                        return false;
                }
 
-               $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getContent( true ) ), -1 );
+               $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getContent() ), -1 );
                array_push( $wgDeferredUpdateList, $u );
 
                $linksTo = $this->mTitle->getLinksTo();
@@ -1977,6 +2016,8 @@ class Article {
                $dbw->delete( 'pagelinks', array( 'pl_from' => $id ) );
                $dbw->delete( 'imagelinks', array( 'il_from' => $id ) );
                $dbw->delete( 'categorylinks', array( 'cl_from' => $id ) );
+               $dbw->delete( 'templatelinks', array( 'tl_from' => $id ) );
+               $dbw->delete( 'externallinks', array( 'el_from' => $id ) );
 
                # Log the deletion
                $log = new LogPage( 'delete' );
@@ -2001,12 +2042,12 @@ class Article {
                                return;
                        }
                } else {
-                       $wgOut->sysopRequired();
+                       $wgOut->permissionRequired( 'rollback' );
                        return;
                }
 
                if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage( $this->getContent( true ) );
+                       $wgOut->readOnlyPage( $this->getContent() );
                        return;
                }
                if( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ),
@@ -2141,9 +2182,10 @@ class Article {
 
                $fname = 'Article::editUpdates';
                wfProfileIn( $fname );
-               
+
                # Parse the text
                $options = new ParserOptions;
+                $options->setTidy(true);
                $poutput = $wgParser->parse( $text, $this->mTitle, $options, true, true, $newid );
 
                # Save it to the parser cache
@@ -2159,7 +2201,7 @@ class Article {
                        if ( 0 == mt_rand( 0, 999 ) ) {
                                # Periodically flush old entries from the recentchanges table.
                                global $wgRCMaxAge;
-                               
+
                                $dbw =& wfGetDB( DB_MASTER );
                                $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
                                $recentchanges = $dbw->tableName( 'recentchanges' );
@@ -2185,14 +2227,16 @@ class Article {
                # If this is another user's talk page, update newtalk
 
                if ($this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getName()) {
-                       $other = User::newFromName( $shortTitle );
-                       if( is_null( $other ) && User::isIP( $shortTitle ) ) {
-                               // An anonymous user
-                               $other = new User();
-                               $other->setName( $shortTitle );
-                       }
-                       if( $other ) {
-                               $other->setNewtalk( true );
+                       if (wfRunHooks('ArticleEditUpdateNewTalk', array(&$this)) ) {
+                               $other = User::newFromName( $shortTitle );
+                               if( is_null( $other ) && User::isIP( $shortTitle ) ) {
+                                       // An anonymous user
+                                       $other = new User();
+                                       $other->setName( $shortTitle );
+                               }
+                               if( $other ) {
+                                       $other->setNewtalk( true );
+                               }
                        }
                }
 
@@ -2204,7 +2248,11 @@ class Article {
        }
 
        /**
-        * @todo document this function
+        * Generate the navigation links when browsing through an article revisions
+        * It shows the information as:
+        *   Revision as of <date>; view current revision
+        *   <- Previous version | Next Version ->
+        *
         * @access private
         * @param string $oldid         Revision ID of this article revision
         */
@@ -2217,7 +2265,10 @@ class Article {
                $lnk = $current
                        ? wfMsg( 'currentrevisionlink' )
                        : $lnk = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'currentrevisionlink' ) );
-               $prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid );
+               $prev = $this->mTitle->getPreviousRevisionID( $oldid ) ;
+               $prevlink = $prev
+                       ? $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid )
+                       : wfMsg( 'previousrevision' );
                $nextlink = $current
                        ? wfMsg( 'nextrevision' )
                        : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
@@ -2434,9 +2485,9 @@ class Article {
 
        function onArticleDelete( $title ) {
                global $wgMessageCache;
-               
+
                $title->touchLinks();
-               
+
                if( $title->getNamespace() == NS_MEDIAWIKI) {
                        $wgMessageCache->replace( $title->getDBkey(), false );
                }
@@ -2447,9 +2498,9 @@ class Article {
         */
        function onArticleEdit( $title ) {
                global $wgUseSquid, $wgPostCommitUpdateList, $wgUseFileCache;
-               
+
                $urls = array();
-               
+
                // Template namespace? Purge all articles linking here.
                // FIXME: When a templatelinks table arrives, use it for all includes.
                if ( $title->getNamespace() == NS_TEMPLATE) {
@@ -2507,7 +2558,7 @@ class Article {
                                $wgOut->addHTML(wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ) );
                        }
                } else {
-                       $dbr =& $this->getDB( DB_SLAVE );
+                       $dbr =& wfGetDB( DB_SLAVE );
                        $wl_clause = array(
                                'wl_title'     => $page->getDBkey(),
                                'wl_namespace' => $page->getNamespace() );
@@ -2549,7 +2600,7 @@ class Article {
                        return false;
                }
 
-               $dbr =& $this->getDB( DB_SLAVE );
+               $dbr =& wfGetDB( DB_SLAVE );
 
                $rev_clause = array( 'rev_page' => $id );
                $fname = 'Article::pageCountInfo';