added 'rev-suppressed-unhide-diff'

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index 0f09dc7..6cfb971 100644 (file)
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -364,8 +364,18 @@ CONTROL;
                # Check if this user can see the revisions\r
                $allowed = $this->mOldRev->userCan(Revision::DELETED_TEXT)\r
                        && $this->mNewRev->userCan(Revision::DELETED_TEXT);\r
-               $deleted = $this->mOldRev->isDeleted(Revision::DELETED_TEXT)\r
-                       || $this->mNewRev->isDeleted(Revision::DELETED_TEXT);\r
+               # Check if one of the revisions is deleted/suppressed\r
+               $deleted = $suppressed = false;\r
+               if( $this->mOldRev->isDeleted(Revision::DELETED_TEXT) ) {\r
+                       $deleted = true; // old revisions text is hidden\r
+                       if( $this->mOldRev->isDeleted(Revision::DELETED_RESTRICTED) )\r
+                               $suppressed = true; // also suppressed\r
+               }\r
+               if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {\r
+                       $deleted = true; // new revisions text is hidden\r
+                       if( $this->mNewRev->isDeleted(Revision::DELETED_RESTRICTED) )\r
+                               $suppressed = true; // also suppressed\r
+               }\r
                # Output the diff if allowed...\r
                if( $deleted && (!$this->unhide || !$allowed) ) {\r
                        $this->showDiffStyle();\r
@@ -382,8 +392,8 @@ CONTROL;
                                        'oldid' => $this->mOldid,\r
                                        'unhide' => 1\r
                                ) );\r
-                               $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n",\r
-                                       array( 'rev-deleted-unhide-diff', $link ) );\r
+                               $msg = $suppressed ? 'rev-suppressed-unhide-diff' : 'rev-deleted-unhide-diff';\r
+                               $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", array( $msg, $link ) );\r
                        }\r
                } else if( $wgEnableHtmlDiff && $this->htmldiff ) {\r
                        $multi = $this->getMultiNotice();\r

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 12dae3c..fe6039c 100644 (file)
--- 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 3504bd1..beb9dbc 100644 (file)
--- 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',