Use wfGetDB(DB_SLAVE) when appropriate. Changed deletion summary autogeneration to...
[lhc/web/wiklou.git] / includes / Article.php
index 5a667b6..39c551a 100644 (file)
@@ -52,7 +52,6 @@ class Article {
 
        /**
         * get the title object of the article
-        * @public
         */
        function getTitle() {
                return $this->mTitle;
@@ -60,7 +59,7 @@ class Article {
 
        /**
          * Clear the object
-         * @private
+         * @access private
          */
        function clear() {
                $this->mDataLoaded    = false;
@@ -109,13 +108,13 @@ 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 );
@@ -149,24 +148,33 @@ class Article {
        }
 
        /**
-               This function accepts a title string as parameter
-               ($preload). If this string is non-empty, it attempts
-               to fetch the current revision text. It respects
-               <includeonly>.
-       */
+        * Get the contents of a page from its title and remove includeonly tags
+        *
+        * TODO FIXME: This is only here because of the inputbox extension and
+        * should be moved there
+        *
+        * @deprecated
+        *
+        * @param string The title of the page
+        * @return string The contents of the page
+        */
        function getPreloadedText($preload) {
-               if($preload) {
-                       $preloadTitle=Title::newFromText($preload);
-                       if(isset($preloadTitle) && $preloadTitle->userCanRead()) {
-                       $rev=Revision::newFromTitle($preloadTitle);
-                       if($rev) {
-                               $text=$rev->getText();
-                               $text=preg_replace('/<\/?includeonly>/i','',$text);
-                               return $text;
-                               }
+               if ( $preload === '' )
+                       return '';
+               else {
+                       $preloadTitle = Title::newFromText( $preload );
+                       if ( isset( $preloadTitle ) && $preloadTitle->userCanRead() ) {
+                               $rev=Revision::newFromTitle($preloadTitle);
+                               if ( is_object( $rev ) ) {
+                                       $text = $rev->getText();
+                                       // TODO FIXME: AAAAAAAAAAA, this shouldn't be implementing
+                                       // its own mini-parser! -ævar
+                                       $text = preg_replace( '~</?includeonly>~', '', $text );
+                                       return $text;
+                               } else
+                                       return '';
                        }
                }
-               return '';
        }
 
        /**
@@ -194,14 +202,14 @@ class Article {
                # split it up by section
                $secs =
                  preg_split(
-                 '/(^=+.+?=+|^<h[1-6].*?' . '>.*?<\/h[1-6].*?' . '>)(?!\S)/mi',
+                 '/(^=+.+?=+|^<h[1-6].*?>.*?<\/h[1-6].*?>)(?!\S)/mi',
                  $striptext, -1,
                  PREG_SPLIT_DELIM_CAPTURE);
                if($section==0) {
                        $rv=$secs[0];
                } else {
                        $headline=$secs[$section*2-1];
-                       preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$headline,$matches);
+                       preg_match( '/^(=+).+?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>(?!\S)/mi',$headline,$matches);
                        $hlevel=$matches[1];
 
                        # translate wiki heading into level
@@ -216,7 +224,7 @@ class Article {
                        while(!empty($secs[$count*2-1]) && !$break) {
 
                                $subheadline=$secs[$count*2-1];
-                               preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$subheadline,$matches);
+                               preg_match( '/^(=+).+?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>(?!\S)/mi',$subheadline,$matches);
                                $subhlevel=$matches[1];
                                if(strpos($subhlevel,'=')!==false) {
                                        $subhlevel=strlen($subhlevel);
@@ -240,7 +248,8 @@ class Article {
        }
 
        /**
-        * Return the oldid of the article that is to be shown, 0 for the current revision
+        * @return int The oldid of the article that is to be shown, 0 for the
+        *             current revision
         */
        function getOldID() {
                if ( is_null( $this->mOldId ) ) {
@@ -250,8 +259,9 @@ class Article {
        }
 
        /**
-        * Get the old ID from the request, return it.
         * Sets $this->mRedirectUrl to a correct URL if the query parameters are incorrect
+        *
+        * @return int The old id for the request
         */
        function getOldIDFromRequest() {
                global $wgRequest;
@@ -336,15 +346,22 @@ class Article {
                return $row ;
        }
 
+       /**
+        * @param Database $dbr
+        * @param Title $title
+        */
        function pageDataFromTitle( &$dbr, $title ) {
                return $this->pageData( $dbr, array(
                        'page_namespace' => $title->getNamespace(),
                        'page_title'     => $title->getDBkey() ) );
        }
 
+       /**
+        * @param Database $dbr
+        * @param int $id
+        */
        function pageDataFromId( &$dbr, $id ) {
-               return $this->pageData( $dbr, array(
-                       'page_id' => intval( $id ) ) );
+               return $this->pageData( $dbr, array( 'page_id' => $id ) );
        }
 
        /**
@@ -377,7 +394,7 @@ class Article {
                if ( $this->mContentLoaded ) {
                        return $this->mContent;
                }
-               
+
                $dbr =& $this->getDB();
                $fname = 'Article::fetchContent';
 
@@ -487,9 +504,12 @@ class Article {
 
        /**
         * Gets the article text without using so many damn globals
-        * Returns false on error
         *
-        * @param integer $oldid
+        * 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 );
@@ -497,6 +517,8 @@ class Article {
 
        /**
         * Read/write accessor to select FOR UPDATE
+        *
+        * @param mixed $x
         */
        function forUpdate( $x = NULL ) {
                return wfSetVar( $this->mForUpdate, $x );
@@ -504,21 +526,20 @@ class Article {
 
        /**
         * Get the database which should be used for reads
+        *
+        * @return Database
         */
        function &getDB() {
                $ret =& wfGetDB( DB_MASTER );
                return $ret;
-               #if ( $this->mForUpdate ) {
-                       $ret =& wfGetDB( DB_MASTER );
-               #} else {
-               #       $ret =& wfGetDB( DB_SLAVE );
-               #}
-               return $ret;
        }
 
        /**
         * Get options for all SELECT statements
-        * Can pass an option array, to which the class-wide options will be appended
+        *
+        * @param array $options an optional options array which'll be appended to
+        *                       the default
+        * @return array Options
         */
        function getSelectOptions( $options = '' ) {
                if ( $this->mForUpdate ) {
@@ -532,7 +553,7 @@ class Article {
        }
 
        /**
-        * Return the Article ID
+        * @return int Page ID
         */
        function getID() {
                if( $this->mTitle ) {
@@ -543,20 +564,19 @@ class Article {
        }
 
        /**
-        * Returns true if this article exists in the database.
-        * @return bool
+        * @return bool Whether or not the page exists in the database
         */
        function exists() {
                return $this->getId() != 0;
        }
 
        /**
-        * Get the view count for this article
+        * @return int The view count for the page
         */
        function getCount() {
                if ( -1 == $this->mCounter ) {
                        $id = $this->getID();
-                       $dbr =& $this->getDB();
+                       $dbr =& wfGetDB( DB_SLAVE );
                        $this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
                                'Article::getCount', $this->getSelectOptions() );
                }
@@ -564,23 +584,27 @@ class Article {
        }
 
        /**
-        * Would the given text make this article a "good" article (i.e.,
-        * suitable for including in the article count)?
+        * 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 string $text Text to analyze
-        * @return integer 1 if it can be counted else 0
+        * @return bool
         */
        function isCountable( $text ) {
                global $wgUseCommaCount;
 
-               if ( NS_MAIN != $this->mTitle->getNamespace() ) { return 0; }
-               if ( $this->isRedirect( $text ) ) { return 0; }
-               $token = ($wgUseCommaCount ? ',' : '[[' );
-               if ( false === strstr( $text, $token ) ) { return 0; }
-               return 1;
+               $token = $wgUseCommaCount ? ',' : '[[';
+               return
+                       $this->mTitle->getNamespace() == NS_MAIN
+                       && ! $this->isRedirect( $text )
+                       && in_string( $token, $text );
        }
 
        /**
         * Tests if the article text represents a redirect
+        *
+        * @param string $text
+        * @return bool
         */
        function isRedirect( $text = false ) {
                if ( $text === false ) {
@@ -606,7 +630,7 @@ class Article {
        /**
         * Loads everything except the text
         * This isn't necessary for all uses, so it's only done if needed.
-        * @private
+        * @access private
         */
        function loadLastEdit() {
                global $wgOut;
@@ -666,7 +690,7 @@ class Article {
 
                $title = $this->mTitle;
                $contribs = array();
-               $dbr =& $this->getDB();
+               $dbr =& wfGetDB( DB_SLAVE );
                $revTable = $dbr->tableName( 'revision' );
                $userTable = $dbr->tableName( 'user' );
                $encDBkey = $dbr->addQuotes( $title->getDBkey() );
@@ -701,11 +725,12 @@ class Article {
        function view() {
                global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgContLang;
                global $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol, $wgParser;
-               global $wgParserCache, $wgUseTrackbacks;
+               global $wgUseTrackbacks;
                $sk = $wgUser->getSkin();
 
                $fname = 'Article::view';
                wfProfileIn( $fname );
+               $parserCache =& ParserCache::singleton();
                # Get variables from query string
                $oldid = $this->getOldID();
 
@@ -743,7 +768,7 @@ class Article {
                }
 
                if ( empty( $oldid ) && $this->checkTouched() ) {
-                       $wgOut->setETag($wgParserCache->getETag($this, $wgUser));
+                       $wgOut->setETag($parserCache->getETag($this, $wgUser));
 
                        if( $wgOut->checkLastModified( $this->mTouched ) ){
                                wfProfileOut( $fname );
@@ -807,7 +832,7 @@ class Article {
                                        $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 ) ) {
@@ -833,13 +858,13 @@ class Article {
                         * trigger when the parser cache is used.
                         */
                        wfRunHooks( 'ArticleViewHeader', array( &$this ) ) ;
+                       $wgOut->setRevisionId( $this->getRevIdFetched() );
                        # wrap user css and user js in pre and don't parse
                        # XXX: use $this->mTitle->usCssJsSubpage() when php is fixed/ a workaround is found
                        if (
                                $this->mTitle->getNamespace() == NS_USER &&
                                preg_match('/\\/[\\w]+\\.(css|js)$/', $this->mTitle->getDBkey())
                        ) {
-                               $wgOut->setRevisionId( $this->getRevIdFetched() );
                                $wgOut->addWikiText( wfMsg('clearyourcache'));
                                $wgOut->addHTML( '<pre>'.htmlspecialchars($this->mContent)."\n</pre>" );
                        } else if ( $rt = Title::newFromRedirect( $text ) ) {
@@ -857,12 +882,9 @@ class Article {
                                  '<span class="redirectText">'.$link.'</span>' );
 
                                $parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
-                               $catlinks = $parseout->getCategoryLinks();
-                               $wgOut->addCategoryLinks($catlinks);
-                               $skin = $wgUser->getSkin();
+                               $wgOut->addParserOutputNoText( $parseout );
                        } else if ( $pcache ) {
                                # Display content and save to parser cache
-                               $wgOut->setRevisionId( $this->getRevIdFetched() );
                                $wgOut->addPrimaryWikiText( $text, $this );
                        } else {
                                # Display content, don't attempt to save to parser cache
@@ -871,7 +893,6 @@ class Article {
                                if( !$this->isCurrent() ) {
                                        $oldEditSectionSetting = $wgOut->mParserOptions->setEditSection( false );
                                }
-                               $wgOut->setRevisionId( $this->getRevIdFetched() );
                                $wgOut->addWikiText( $text );
 
                                if( !$this->isCurrent() ) {
@@ -971,11 +992,11 @@ class Article {
                $wgOut->setArticleBodyOnly(true);
                $this->view();
        }
-       
+
        function purge() {
                global $wgUser, $wgRequest, $wgOut, $wgUseSquid;
 
-               if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() ) {
+               if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() || ! wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
                        // Invalidate the cache
                        $this->mTitle->invalidateCache();
 
@@ -993,7 +1014,7 @@ class Article {
                        $msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
                        $action = $this->mTitle->escapeLocalURL( 'action=purge' );
                        $button = htmlspecialchars( wfMsg( 'confirm_purge_button' ) );
-                       $msg = str_replace( '$1', 
+                       $msg = str_replace( '$1',
                                "<form method=\"post\" action=\"$action\">\n" .
                                "<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
                                "</form>\n", $msg );
@@ -1046,12 +1067,12 @@ class Article {
         * Update the page record to point to a newly saved revision.
         *
         * @param Database $dbw
-        * @param Revision $revision -- for ID number, and text used to set
-                                       length and redirect status fields
-        * @param int $lastRevision -- if given, will not overwrite the page field
-        *                             when different from the currently set value.
-        *                             Giving 0 indicates the new page flag should
-        *                             be set on.
+        * @param Revision $revision For ID number, and text used to set
+                                    length and redirect status fields
+        * @param int $lastRevision If given, will not overwrite the page field
+        *                          when different from the currently set value.
+        *                          Giving 0 indicates the new page flag should
+        *                          be set on.
         * @return bool true on success, false on failure
         * @access private
         */
@@ -1120,7 +1141,7 @@ class Article {
         * 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.
-        * @private
+        * @access private
         */
        function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
                global $wgOut, $wgUser, $wgUseSquid;
@@ -1134,8 +1155,8 @@ class Article {
                        wfProfileOut( $fname );
                        return false;
                }
-               
-               $this->mGoodAdjustment = $this->isCountable( $text );
+
+               $this->mGoodAdjustment = (int)$this->isCountable( $text );
                $this->mTotalAdjustment = 1;
 
                $ns = $this->mTitle->getNamespace();
@@ -1146,7 +1167,9 @@ class Article {
                        $text="== {$summary} ==\n\n".$text;
                }
                $text = $this->preSaveTransform( $text );
-               $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
+
+               /* Silently ignore minoredit if not allowed */
+               $isminor = $isminor && $wgUser->isAllowed('minoredit');
                $now = wfTimestampNow();
 
                $dbw =& wfGetDB( DB_MASTER );
@@ -1247,7 +1270,7 @@ class Article {
                                # split it up
                                # Unfortunately we can't simply do a preg_replace because that might
                                # replace the wrong section, so we have to use the section counter instead
-                               $secs=preg_split('/(^=+.+?=+|^<h[1-6].*?' . '>.*?<\/h[1-6].*?' . '>)(?!\S)/mi',
+                               $secs=preg_split('/(^=+.+?=+|^<h[1-6].*?>.*?<\/h[1-6].*?>)(?!\S)/mi',
                                  $oldtext,-1,PREG_SPLIT_DELIM_CAPTURE);
                                $secs[$section*2]=$text."\n\n"; // replace with edited
 
@@ -1259,7 +1282,7 @@ class Article {
                                        # be erased, as the mother section has been replaced with
                                        # the text of all subsections.
                                        $headline=$secs[$section*2-1];
-                                       preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$headline,$matches);
+                                       preg_match( '/^(=+).+?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>(?!\S)/mi',$headline,$matches);
                                        $hlevel=$matches[1];
 
                                        # determine headline level for wikimarkup headings
@@ -1274,7 +1297,7 @@ class Article {
 
                                                $subheadline=$secs[$count*2-1];
                                                preg_match(
-                                                '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$subheadline,$matches);
+                                                '/^(=+).+?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>(?!\S)/mi',$subheadline,$matches);
                                                $subhlevel=$matches[1];
                                                if(strpos($subhlevel,'=')!==false) {
                                                        $subhlevel=strlen($subhlevel);
@@ -1326,18 +1349,8 @@ class Article {
                        return false;
                }
 
-               $isminor = ( $minor && $wgUser->isLoggedIn() );
-               if ( $this->isRedirect( $text ) ) {
-                       # Remove all content but redirect
-                       # This could be done by reconstructing the redirect from a title given by
-                       # Title::newFromRedirect(), but then we wouldn't know which synonym the user
-                       # wants to see
-                       if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ')[^\\n]+)/i', $text, $m ) ) {
-                               $redir = 1;
-                               $text = $m[1] . "\n";
-                       }
-               }
-               else { $redir = 0; }
+               $isminor = $minor && $wgUser->isAllowed('minoredit');
+               $redir = (int)$this->isRedirect( $text );
 
                $text = $this->preSaveTransform( $text );
                $dbw =& wfGetDB( DB_MASTER );
@@ -1359,8 +1372,8 @@ class Article {
                $revisionId = 0;
 
                if ( 0 != strcmp( $text, $oldtext ) ) {
-                       $this->mGoodAdjustment = $this->isCountable( $text )
-                         - $this->isCountable( $oldtext );
+                       $this->mGoodAdjustment = (int)$this->isCountable( $text )
+                         - (int)$this->isCountable( $oldtext );
                        $this->mTotalAdjustment = 0;
                        $now = wfTimestampNow();
 
@@ -1373,7 +1386,7 @@ class Article {
                                'minor_edit' => $isminor,
                                'text'       => $text
                                ) );
-                       
+
                        $dbw->immediateCommit();
                        $dbw->begin();
                        $revisionId = $revision->insertOn( $dbw );
@@ -1392,7 +1405,7 @@ class Article {
                                        $lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
                                        $revisionId );
                                $dbw->commit();
-                               
+
                                // Update caches outside the main transaction
                                Article::onArticleEdit( $this->mTitle );
                        }
@@ -1427,7 +1440,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();
@@ -1471,14 +1484,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 );
        }
 
@@ -1507,10 +1520,12 @@ class Article {
                $rcid = $wgRequest->getVal( 'rcid' );
                if ( !is_null ( $rcid ) )
                {
-                       RecentChange::markPatrolled( $rcid );
-                       $wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
-                       $wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
-
+                       if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) ) ) {
+                               RecentChange::markPatrolled( $rcid );
+                               wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) );
+                               $wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
+                               $wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
+                       }
                        $rcTitle = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
                        $wgOut->returnToMain( false, $rcTitle->getPrefixedText() );
                }
@@ -1598,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.
         *
@@ -1631,7 +1646,7 @@ class Article {
 
                $flat = Article::flattenRestrictions( $limit );
                $protecting = ($flat != '');
-               
+
                if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser,
                        $limit, $reason ) ) ) {
 
@@ -1657,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.
@@ -1691,18 +1706,28 @@ class Article {
                # This code desperately needs to be totally rewritten
 
                # Check permissions
-               if( ( !$wgUser->isAllowed( 'delete' ) ) ) {
+               if( $wgUser->isAllowed( 'delete' ) ) {
+                       if( $wgUser->isBlocked() ) {
+                               $wgOut->blockedPage();
+                               return;
+                       }
+               } else {
                        $wgOut->sysopRequired();
                        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;
                }
@@ -1714,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 =& $this->getDB();
-               $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
@@ -1779,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 );
@@ -1793,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
         */
@@ -1885,7 +1949,7 @@ class Article {
                        return false;
                }
 
-               $u = new SiteStatsUpdate( 0, 1, -$this->isCountable( $this->getContent( true ) ), -1 );
+               $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getContent( true ) ), -1 );
                array_push( $wgDeferredUpdateList, $u );
 
                $linksTo = $this->mTitle->getLinksTo();
@@ -1970,10 +2034,16 @@ class Article {
                global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
                $fname = 'Article::rollback';
 
-               if ( ! $wgUser->isAllowed('rollback') ) {
+               if( $wgUser->isAllowed( 'rollback' ) ) {
+                       if( $wgUser->isBlocked() ) {
+                               $wgOut->blockedPage();
+                               return;
+                       }
+               } else {
                        $wgOut->sysopRequired();
                        return;
                }
+
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage( $this->getContent( true ) );
                        return;
@@ -2080,7 +2150,7 @@ class Article {
 
        /**
         * Do standard deferred updates after page view
-        * @private
+        * @access private
         */
        function viewUpdates() {
                global $wgDeferredUpdateList;
@@ -2102,21 +2172,22 @@ class Article {
        /**
         * Do standard deferred updates after page edit.
         * Every 1000th edit, prune the recent changes table.
-        * @private
+        * @access private
         * @param string $text
         */
        function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid) {
-               global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser, $wgParserCache;
+               global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser;
 
                $fname = 'Article::editUpdates';
                wfProfileIn( $fname );
-               
+
                # Parse the text
                $options = new ParserOptions;
                $poutput = $wgParser->parse( $text, $this->mTitle, $options, true, true, $newid );
 
                # Save it to the parser cache
-               $wgParserCache->save( $poutput, $this, $wgUser );
+               $parserCache =& ParserCache::singleton();
+               $parserCache->save( $poutput, $this, $wgUser );
 
                # Update the links tables
                $u = new LinksUpdate( $this->mTitle, $poutput );
@@ -2127,7 +2198,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' );
@@ -2173,7 +2244,7 @@ class Article {
 
        /**
         * @todo document this function
-        * @private
+        * @access private
         * @param string $oldid         Revision ID of this article revision
         */
        function setOldSubtitle( $oldid=0 ) {
@@ -2402,9 +2473,9 @@ class Article {
 
        function onArticleDelete( $title ) {
                global $wgMessageCache;
-               
+
                $title->touchLinks();
-               
+
                if( $title->getNamespace() == NS_MEDIAWIKI) {
                        $wgMessageCache->replace( $title->getDBkey(), false );
                }
@@ -2415,9 +2486,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) {
@@ -2475,7 +2546,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() );
@@ -2517,7 +2588,7 @@ class Article {
                        return false;
                }
 
-               $dbr =& $this->getDB( DB_SLAVE );
+               $dbr =& wfGetDB( DB_SLAVE );
 
                $rev_clause = array( 'rev_page' => $id );
                $fname = 'Article::pageCountInfo';