Reinstated r94289 et all - rev_sha1/ar_sha1 field for bug 21860

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

diff --git a/includes/Revision.php b/includes/Revision.php
index ec0508c..f75442c 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -13,6 +13,7 @@ class Revision {
        protected $mTimestamp;
        protected $mDeleted;
        protected $mSize;
+       protected $mSha1;
        protected $mParentId;
        protected $mComment;
        protected $mText;
@@ -122,7 +123,8 @@ class Revision {
                        '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
+                       'len'        => $row->ar_len,
+                       'sha1'       => $row->ar_sha1
                );
                if ( isset( $row->ar_text ) && !$row->ar_text_id ) {
                        // Pre-1.5 ar_text row
@@ -313,7 +315,8 @@ class Revision {
                        'rev_minor_edit',
                        'rev_deleted',
                        'rev_len',
-                       'rev_parent_id'
+                       'rev_parent_id',
+                       'rev_sha1'
                );
        }
 
@@ -375,6 +378,12 @@ class Revision {
                                $this->mSize = intval( $row->rev_len );
                        }
 
+                       if ( !isset( $row->rev_sha1 ) ) {
+                               $this->mSha1 = null;
+                       } else {
+                               $this->mSha1 = $row->rev_sha1;
+                       }
+
                        if( isset( $row->page_latest ) ) {
                                $this->mCurrent = ( $row->rev_id == $row->page_latest );
                                $this->mTitle = Title::newFromRow( $row );
@@ -402,7 +411,7 @@ class Revision {
                        $this->mOrigUserText = $row->rev_user_text;
                } elseif( is_array( $row ) ) {
                        // Build a new revision to be saved...
-                       global $wgUser;
+                       global $wgUser; // ugh
 
                        $this->mId        = isset( $row['id']         ) ? intval( $row['id']         ) : null;
                        $this->mPage      = isset( $row['page']       ) ? intval( $row['page']       ) : null;
@@ -414,6 +423,7 @@ class Revision {
                        $this->mDeleted   = isset( $row['deleted']    ) ? intval( $row['deleted']    ) : 0;
                        $this->mSize      = isset( $row['len']        ) ? intval( $row['len']        ) : null;
                        $this->mParentId  = isset( $row['parent_id']  ) ? intval( $row['parent_id']  ) : null;
+                       $this->mSha1      = isset( $row['sha1']  )      ? strval( $row['sha1']  )      : null;
 
                        // Enforce spacing trimming on supplied text
                        $this->mComment   = isset( $row['comment']    ) ?  trim( strval( $row['comment'] ) ) : null;
@@ -422,9 +432,13 @@ class Revision {
 
                        $this->mTitle     = null; # Load on demand if needed
                        $this->mCurrent   = false;
-                       # If we still have no len_size, see it we have the text to figure it out
+                       # If we still have no length, see it we have the text to figure it out
                        if ( !$this->mSize ) {
-                               $this->mSize      = is_null( $this->mText ) ? null : strlen( $this->mText );
+                               $this->mSize = is_null( $this->mText ) ? null : strlen( $this->mText );
+                       }
+                       # Same for sha1
+                       if ( $this->mSha1 === null ) {
+                               $this->mSha1 = is_null( $this->mText ) ? null : self::base36Sha1( $this->mText );
                        }
                } else {
                        throw new MWException( 'Revision constructor passed invalid row format.' );
@@ -468,6 +482,15 @@ class Revision {
                return $this->mSize;
        }
 
+       /**
+        * Returns the base36 sha1 of the text in this revision, or null if unknown.
+        *
+        * @return String
+        */
+       public function getSha1() {
+               return $this->mSha1;
+       }
+
        /**
         * Returns the title of the page associated with this entry.
         *
@@ -938,8 +961,12 @@ class Revision {
                                'rev_timestamp'  => $dbw->timestamp( $this->mTimestamp ),
                                'rev_deleted'    => $this->mDeleted,
                                'rev_len'        => $this->mSize,
-                               'rev_parent_id'  => is_null($this->mParentId) ?
-                                       $this->getPreviousRevisionId( $dbw ) : $this->mParentId
+                               'rev_parent_id'  => is_null( $this->mParentId )
+                                       ? $this->getPreviousRevisionId( $dbw )
+                                       : $this->mParentId,
+                               'rev_sha1'       => is_null( $this->mSha1 )
+                                       ? Revision::base36Sha1( $this->mText )
+                                       : $this->mSha1
                        ), __METHOD__
                );
 
@@ -951,6 +978,15 @@ class Revision {
                return $this->mId;
        }
 
+       /**
+        * Get the base 36 SHA-1 value for a string of text
+        * @param $text String
+        * @return String
+        */
+       public static function base36Sha1( $text ) {
+               return wfBaseConvert( sha1( $text ), 16, 36, 31 );
+       }
+
        /**
         * Lazy-load the revision's text.
         * Currently hardcoded to the 'text' table storage engine.