(bug 18821) Delete unused fetchAllRevisions(), which doesn't do what it says anyway.

[lhc/web/wiklou.git] / includes / Revision.php

diff --git a/includes/Revision.php b/includes/Revision.php
index ab017f9..f53dbac 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -53,6 +53,10 @@ class Revision {
                        // Get the latest revision ID from the master
                        $dbw = wfGetDB( DB_MASTER );
                        $latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
+                       if ( $latest === false ) {
+                               // Page does not exist
+                               return null;
+                       }
                        $conds['rev_id'] = $latest;
                } else {
                        // Use a join to get the latest revision
@@ -62,6 +66,30 @@ class Revision {
                return Revision::newFromConds( $conds );
        }
 
+       /**
+        * Make a fake revision object from an archive table row. This is queried
+        * for permissions or even inserted (as in Special:Undelete)
+        * @fixme: should be a subclass for RevisionDelete. [TS]
+        */
+       public static function newFromArchiveRow( $row, $overrides = array() ) {
+               $attribs = $overrides + array(
+                       'page'       => isset( $row->page_id ) ? $row->page_id : null,
+                       'id'         => isset( $row->ar_rev_id ) ? $row->ar_rev_id : null,
+                       'comment'    => $row->ar_comment,
+                       'user'       => $row->ar_user,
+                       'user_text'  => $row->ar_user_text,
+                       'timestamp'  => $row->ar_timestamp,
+                       'minor_edit' => $row->ar_minor_edit,
+                       'text_id'    => isset( $row->ar_text_id ) ? $row->ar_text_id : null,
+                       'deleted'    => $row->ar_deleted,
+                       'len'        => $row->ar_len);
+               if ( isset( $row->ar_text ) && !$row->ar_text_id ) {
+                       // Pre-1.5 ar_text row
+                       $attribs['text'] = $row->ar_text;
+               }
+               return new self( $attribs );
+       }
+
        /**
         * Load a page revision from a given revision ID number.
         * Returns null if no such revision can be found.
@@ -188,24 +216,6 @@ class Revision {
                return $ret;
        }
 
-       /**
-        * Return a wrapper for a series of database rows to
-        * fetch all of a given page's revisions in turn.
-        * Each row can be fed to the constructor to get objects.
-        *
-        * @param Title $title
-        * @return ResultWrapper
-        * @access public
-        * @static
-        */
-       public static function fetchAllRevisions( $title ) {
-               return Revision::fetchFromConds(
-                       wfGetDB( DB_SLAVE ),
-                       array( 'page_namespace' => $title->getNamespace(),
-                              'page_title'     => $title->getDBkey(),
-                              'page_id=rev_page' ) );
-       }
-
        /**
         * Return a wrapper for a series of database rows to
         * fetch all of a given page's revisions in turn.
@@ -363,6 +373,7 @@ class Revision {
                } else {
                        throw new MWException( 'Revision constructor passed invalid row format.' );
                }
+               $this->mUnpatrolled = NULL;
        }
 
        /**#@+
@@ -536,6 +547,27 @@ class Revision {
        public function isMinor() {
                return (bool)$this->mMinorEdit;
        }
+       
+       /**
+        * @return int rcid of the unpatrolled row, zero if there isn't one
+        */
+       public function isUnpatrolled() {
+               if( $this->mUnpatrolled !== NULL ) {
+                       return $this->mUnpatrolled;
+               }
+               $dbr = wfGetDB( DB_SLAVE );
+               $this->mUnpatrolled = $dbr->selectField( 'recentchanges',
+                       'rc_id',
+                       array( // Add redundant user,timestamp condition so we can use the existing index
+                               'rc_user_text'  => $this->getRawUserText(),
+                               'rc_timestamp'  => $dbr->timestamp( $this->getTimestamp() ),
+                               'rc_this_oldid' => $this->getId(),
+                               'rc_patrolled'  => 0
+                       ),
+                       __METHOD__
+               );
+               return (int)$this->mUnpatrolled;
+       }
 
        /**
         * int $field one of DELETED_* bitfield constants
@@ -720,9 +752,11 @@ class Revision {
                        }
 
                        global $wgLegacyEncoding;
-                       if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) ) {
+                       if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) && !in_array( 'utf8', $flags ) ) {
                                # Old revisions kept around in a legacy encoding?
                                # Upconvert on demand.
+                               # ("utf8" checked for compatibility with some broken
+                               #  conversion scripts 2008-12-30)
                                global $wgInputEncoding, $wgContLang;
                                $text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
                        }
@@ -817,7 +851,8 @@ class Revision {
                                'rev_timestamp'  => $dbw->timestamp( $this->mTimestamp ),
                                'rev_deleted'    => $this->mDeleted,
                                'rev_len'            => $this->mSize,
-                               'rev_parent_id'  => $this->mParentId ? $this->mParentId : $this->getPreviousRevisionId( $dbw )
+                               'rev_parent_id'  => is_null($this->mParentId) ?
+                                       $this->getPreviousRevisionId( $dbw ) : $this->mParentId
                        ), __METHOD__
                );
 
@@ -835,15 +870,17 @@ class Revision {
         *
         * @return string
         */
-       private function loadText() {
+       protected function loadText() {
                wfProfileIn( __METHOD__ );
 
                // Caching may be beneficial for massive use of external storage
                global $wgRevisionCacheExpiry, $wgMemc;
-               $key = wfMemcKey( 'revisiontext', 'textid', $this->getTextId() );
+               $textId = $this->getTextId();
+               $key = wfMemcKey( 'revisiontext', 'textid', $textId );
                if( $wgRevisionCacheExpiry ) {
                        $text = $wgMemc->get( $key );
                        if( is_string( $text ) ) {
+                               wfDebug( __METHOD__. ": got id $textId from cache\n" );
                                wfProfileOut( __METHOD__ );
                                return $text;
                        }
@@ -906,7 +943,7 @@ class Revision {
 
                $current = $dbw->selectRow(
                        array( 'page', 'revision' ),
-                       array( 'page_latest', 'rev_text_id' ),
+                       array( 'page_latest', 'rev_text_id', 'rev_len' ),
                        array(
                                'page_id' => $pageId,
                                'page_latest=rev_id',
@@ -919,7 +956,8 @@ class Revision {
                                'comment'    => $summary,
                                'minor_edit' => $minor,
                                'text_id'    => $current->rev_text_id,
-                               'parent_id'  => $current->page_latest
+                               'parent_id'  => $current->page_latest,
+                               'len'        => $current->rev_len
                                ) );
                } else {
                        $revision = null;
@@ -958,6 +996,10 @@ class Revision {
         */
        static function getTimestampFromId( $title, $id ) {
                $dbr = wfGetDB( DB_SLAVE );
+               // Casting fix for DB2
+               if ($id == '') {
+                       $id = 0;
+               }
                $conds = array( 'rev_id' => $id );
                $conds['rev_page'] = $title->getArticleId();
                $timestamp = $dbr->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );