From 4f9f6cbf734d0a8ba497268f7e229a6b76cdff0f Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 30 Sep 2009 23:12:05 +0000
Subject: [PATCH] added 'rev-suppressed-unhide-diff'

---
 includes/diff/DifferenceInterface.php | 18 ++++++++++++++----
 languages/messages/MessagesEn.php     |  3 +++
 maintenance/language/messages.inc     |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index 0f09dc7e81..6cfb9717a5 100644
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -364,8 +364,18 @@ CONTROL;
 		# Check if this user can see the revisions
 		$allowed = $this->mOldRev->userCan(Revision::DELETED_TEXT)
 			&& $this->mNewRev->userCan(Revision::DELETED_TEXT);
-		$deleted = $this->mOldRev->isDeleted(Revision::DELETED_TEXT)
-			|| $this->mNewRev->isDeleted(Revision::DELETED_TEXT);
+		# Check if one of the revisions is deleted/suppressed
+		$deleted = $suppressed = false;
+		if( $this->mOldRev->isDeleted(Revision::DELETED_TEXT) ) {
+			$deleted = true; // old revisions text is hidden
+			if( $this->mOldRev->isDeleted(Revision::DELETED_RESTRICTED) )
+				$suppressed = true; // also suppressed
+		}
+		if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
+			$deleted = true; // new revisions text is hidden
+			if( $this->mNewRev->isDeleted(Revision::DELETED_RESTRICTED) )
+				$suppressed = true; // also suppressed
+		}
 		# Output the diff if allowed...
 		if( $deleted && (!$this->unhide || !$allowed) ) {
 			$this->showDiffStyle();
@@ -382,8 +392,8 @@ CONTROL;
 					'oldid' => $this->mOldid,
 					'unhide' => 1
 				) );
-				$wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n",
-					array( 'rev-deleted-unhide-diff', $link ) );
+				$msg = $suppressed ? 'rev-suppressed-unhide-diff' : 'rev-deleted-unhide-diff';
+				$wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", array( $msg, $link ) );
 			}
 		} else if( $wgEnableHtmlDiff && $this->htmldiff ) {
 			$multi = $this->getMultiNotice();
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 12dae3cafd..fe6039cbd5 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1441,6 +1441,9 @@ There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENA
 'rev-deleted-unhide-diff'     => "One of the revisions of this diff has been '''deleted'''.
 There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].
 As an administrator you can still [$1 view this diff] if you wish to proceed.",
+'rev-suppressed-unhide-diff'     => "One of the revisions of this diff has been '''suppressed'''.
+There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].
+As an administrator you can still [$1 view this diff] if you wish to proceed.",
 'rev-delundel'                => 'show/hide',
 'revisiondelete'              => 'Delete/undelete revisions',
 'revdelete-nooldid-title'     => 'Invalid target revision',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 3504bd1c8b..beb9dbc0c9 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -663,6 +663,7 @@ $wgMessageStructure = array(
 		'rev-suppressed-text-view',
 		'rev-deleted-no-diff',
 		'rev-deleted-unhide-diff',
+		'rev-suppressed-unhide-diff',
 		'rev-delundel',
 		'revisiondelete',
 		'revdelete-nooldid-title',
-- 
2.20.1