From 95300b2e5554ee6ee7fff11f890b1dac96b42c27 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 15 Aug 2011 18:52:33 +0000 Subject: [PATCH] Followup r94541 (reverts of r94289 undiscussed core schema change and followups), two more that got missed: reverts of r94290, r94364 --- includes/Revision.php | 53 ++++----------------------- includes/WikiPage.php | 3 +- includes/specials/SpecialUndelete.php | 5 +-- 3 files changed, 11 insertions(+), 50 deletions(-) diff --git a/includes/Revision.php b/includes/Revision.php index 996f7ef541..f93108017b 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -110,9 +110,7 @@ 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, - 'sha1' => $row->ar_sha1 - ); + 'len' => $row->ar_len); if ( isset( $row->ar_text ) && !$row->ar_text_id ) { // Pre-1.5 ar_text row $attribs['text'] = self::getRevisionText( $row, 'ar_' ); @@ -303,8 +301,7 @@ class Revision { 'rev_minor_edit', 'rev_deleted', 'rev_len', - 'rev_parent_id', - 'rev_sha1' + 'rev_parent_id' ); } @@ -360,12 +357,6 @@ 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 ); @@ -384,7 +375,7 @@ class Revision { } } elseif( is_array( $row ) ) { // Build a new revision to be saved... - global $wgUser; // ugh + global $wgUser; $this->mId = isset( $row['id'] ) ? intval( $row['id'] ) : null; $this->mPage = isset( $row['page'] ) ? intval( $row['page'] ) : null; @@ -396,7 +387,6 @@ 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; @@ -405,14 +395,9 @@ class Revision { $this->mTitle = null; # Load on demand if needed $this->mCurrent = false; - # 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 ); - } - # Same for sha1 - if ( $this->mSha1 === null ) { - $this->mSha1 = is_null( $this->mText ) ? null : self::base36Sha1( $this->mText ); - } + # If we still have no len_size, see it we have the text to figure it out + if ( !$this->mSize ) + $this->mSize = is_null( $this->mText ) ? null : strlen( $this->mText ); } else { throw new MWException( 'Revision constructor passed invalid row format.' ); } @@ -455,15 +440,6 @@ 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. * @@ -923,12 +899,8 @@ 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_sha1' => is_null( $this->mSha1 ) - ? Revision::base36Sha1( $this->mText ) - : $this->mSha1 + 'rev_parent_id' => is_null($this->mParentId) ? + $this->getPreviousRevisionId( $dbw ) : $this->mParentId ), __METHOD__ ); @@ -940,15 +912,6 @@ 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. diff --git a/includes/WikiPage.php b/includes/WikiPage.php index bc85bdc28f..47632c05de 100644 --- a/includes/WikiPage.php +++ b/includes/WikiPage.php @@ -1662,8 +1662,7 @@ class WikiPage extends Page { 'ar_flags' => '\'\'', // MySQL's "strict mode"... 'ar_len' => 'rev_len', 'ar_page_id' => 'page_id', - 'ar_deleted' => $bitfield, - 'ar_sha1' => 'rev_sha1' + 'ar_deleted' => $bitfield ), array( 'page_id' => $id, 'page_id = rev_page' diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index b4e0097640..2dea1a890c 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -124,7 +124,7 @@ class PageArchive { $res = $dbr->select( 'archive', array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', - 'ar_comment', 'ar_len', 'ar_deleted', 'ar_rev_id', 'ar_sha1' + 'ar_comment', 'ar_len', 'ar_deleted', 'ar_rev_id' ), array( 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey() ), @@ -464,8 +464,7 @@ class PageArchive { 'ar_text_id', 'ar_deleted', 'ar_page_id', - 'ar_len', - 'ar_sha1' ), + 'ar_len' ), /* WHERE */ array( 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey(), -- 2.20.1