From 81e7adc6ad69fb34519da83fe90dba830c38e0a9 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 22 Sep 2008 14:24:18 +0000
Subject: [PATCH] Remove Revision::revText() and move functionality to
 getText()

---
 includes/Article.php                  |  2 +-
 includes/Revision.php                 | 18 ++++--------------
 includes/diff/DifferenceEngine.php    |  4 ++--
 includes/specials/SpecialUndelete.php |  4 ++--
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 66599f676e..98ae798e97 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -448,7 +448,7 @@ class Article {
 
 		// FIXME: Horrible, horrible! This content-loading interface just plain sucks.
 		// We should instead work with the Revision object when we need it...
-		$this->mContent   = $revision->revText(); // Loads if user is allowed
+		$this->mContent   = $revision->getText( false ); // Loads if user is allowed
 
 		$this->mUser      = $revision->getUser();
 		$this->mUserText  = $revision->getUserText();
diff --git a/includes/Revision.php b/includes/Revision.php
index c6c8be85b8..79aa20f0a0 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -505,8 +505,10 @@ class Revision {
 	 * Fetch revision text if it's available to all users
 	 * @return string
 	 */
-	public function getText() {
-		if( $this->isDeleted( self::DELETED_TEXT ) ) {
+	public function getText( $isPublic = true ) {
+		if( $isPublic && $this->isDeleted( self::DELETED_TEXT ) ) {
+			return "";
+		} else if( !$this->userCan( self::DELETED_TEXT ) ) {
 			return "";
 		} else {
 			return $this->getRawText();
@@ -525,18 +527,6 @@ class Revision {
 		return $this->mText;
 	}
 
-	/**
-	 * Fetch revision text if it's available to THIS user
-	 * @return string
-	 */
-	public function revText() {
-		if( !$this->userCan( self::DELETED_TEXT ) ) {
-			return "";
-		} else {
-			return $this->getRawText();
-		}
-	}
-
 	/**
 	 * @return string
 	 */
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 7bfda1e772..958af1babf 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -847,13 +847,13 @@ CONTROL;
 			return false;
 		}
 		if ( $this->mOldRev ) {
-			$this->mOldtext = $this->mOldRev->revText();
+			$this->mOldtext = $this->mOldRev->getText( false );
 			if ( $this->mOldtext === false ) {
 				return false;
 			}
 		}
 		if ( $this->mNewRev ) {
-			$this->mNewtext = $this->mNewRev->revText();
+			$this->mNewtext = $this->mNewRev->getText( false );
 			if ( $this->mNewtext === false ) {
 				return false;
 			}
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index cfff82fb7b..effa45ceae 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -787,7 +787,7 @@ class UndeleteForm {
 			$popts = $wgOut->parserOptions();
 			$popts->setEditSection( false );
 			$wgOut->parserOptions( $popts );
-			$wgOut->addWikiTextTitleTidy( $rev->revText(), $this->mTargetObj, true );
+			$wgOut->addWikiTextTitleTidy( $rev->getText( false ), $this->mTargetObj, true );
 		}
 
 		$wgOut->addHtml(
@@ -795,7 +795,7 @@ class UndeleteForm {
 					'readonly' => 'readonly',
 					'cols' => intval( $wgUser->getOption( 'cols' ) ),
 					'rows' => intval( $wgUser->getOption( 'rows' ) ) ),
-				$rev->revText() . "\n" ) .
+				$rev->getText( false ) . "\n" ) .
 			wfOpenElement( 'div' ) .
 			wfOpenElement( 'form', array(
 				'method' => 'post',
-- 
2.20.1