From b0e6c631cad512961f14759596ef71e66a7f2445 Mon Sep 17 00:00:00 2001 From: Leon Liesener Date: Sat, 26 Jul 2014 00:44:14 +0200 Subject: [PATCH] Fix appearance of suppress messages at Special:Undelete This change makes 'Rev-suppressed-text-view' appear in case suppressed page content is viewed through Special:Undelete and 'Rev-suppressed-text-permission' in case there is a disallowed attempt to do so. Bug: 56380 Change-Id: I2440227b3e5a9b5baec81b57bb479ecc26052b27 --- includes/specials/SpecialUndelete.php | 6 ++++-- languages/i18n/en.json | 1 + languages/i18n/qqq.json | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 04b36c7fc4..25f520e357 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -910,7 +910,8 @@ class SpecialUndelete extends SpecialPage { if ( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) { $out->wrapWikiMsg( "
\n$1\n
\n", - 'rev-deleted-text-permission' + $rev->isDeleted( Revision::DELETED_RESTRICTED ) ? + 'rev-suppressed-text-permission' : 'rev-deleted-text-permission' ); return; @@ -918,7 +919,8 @@ class SpecialUndelete extends SpecialPage { $out->wrapWikiMsg( "
\n$1\n
\n", - 'rev-deleted-text-view' + $rev->isDeleted( Revision::DELETED_RESTRICTED ) ? + 'rev-suppressed-text-view' : 'rev-deleted-text-view' ); $out->addHTML( '
' ); // and we are allowed to see... diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 1abc6cc2c7..78570dcda5 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -754,6 +754,7 @@ "rev-deleted-event": "(log action removed)", "rev-deleted-user-contribs": "[username or IP address removed - edit hidden from contributions]", "rev-deleted-text-permission": "This page revision has been deleted.\nDetails can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", + "rev-suppressed-text-permission": "This page revision has been suppressed.\nDetails can be found in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].", "rev-deleted-text-unhide": "This page revision has been deleted.\nDetails can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].\nYou can still [$1 view this revision] if you wish to proceed.", "rev-suppressed-text-unhide": "This page revision has been suppressed.\nDetails can be found in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].\nYou can still [$1 view this revision] if you wish to proceed.", "rev-deleted-text-view": "This page revision has been deleted.\nYou can view it; details can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 219e0427cd..a95fb72e4e 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -915,11 +915,12 @@ "rev-deleted-user": "See also:\n* {{msg-mw|Rev-deleted-event}}", "rev-deleted-event": "See also:\n* {{msg-mw|Rev-deleted-user}}", "rev-deleted-user-contribs": "Part of revision deletion.", - "rev-deleted-text-permission": "{{Related|Rev-deleted-text}}", + "rev-deleted-text-permission": "This message appears in case a user lacking permission tries to view a past deleted revision of a page, although later revisions of the page still exist.\n{{Related|Rev-deleted-text}}", + "rev-suppressed-text-permission": "This message appears in case a user lacking permission tries to view a past suppressed revision of a page, although later revisions of the page still exist.\n{{Related|Rev-deleted-text}}", "rev-deleted-text-unhide": "Parameters:\n* $1 - a HTML link to the revision\n{{Related|Rev-deleted-text}}", "rev-suppressed-text-unhide": "Parameters:\n* $1 - a HTML link to the revision\n{{Related|Rev-deleted-text}}", - "rev-deleted-text-view": "This is an error message which appears if a user tries to view a past revision of a page, where the revision has been hidden from view, although later revisions of the page still exist.", - "rev-suppressed-text-view": "{{Related|Rev-deleted-text}}", + "rev-deleted-text-view": "This message appears in case a user tries to view a past deleted revision of a page, although later revisions of the page still exist.\n{{Related|Rev-deleted-text}}", + "rev-suppressed-text-view": "This message appears in case a user tries to view a past suppressed revision of a page, although later revisions of the page still exist.\n{{Related|Rev-deleted-text}}", "rev-deleted-no-diff": "See also:\n* {{msg-mw|Rev-suppressed-no-diff}}", "rev-suppressed-no-diff": "See also:\n* {{msg-mw|Rev-deleted-no-diff}}", "rev-deleted-unhide-diff": "Parameters:\n* $1 - a HTML link to the diff\n{{Related|Rev-deleted-diff}}", -- 2.20.1