From ebb8c885032b214bd3a891e78384ad6a71da199c Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 30 Jul 2009 18:01:41 +0000 Subject: [PATCH] * Separated some delete & suppress message headers (bug 18839) * rev-deleted message cleanup with log links --- includes/Article.php | 11 ++++++----- languages/messages/MessagesEn.php | 11 ++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index 8474e59252..ee738d5f44 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -1150,12 +1150,10 @@ class Article { */ public function showDeletedRevisionHeader() { global $wgOut, $wgRequest; - if( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { // Not deleted return true; } - // If the user is not allowed to see it... if( !$this->mRevision->userCan(Revision::DELETED_TEXT) ) { $wgOut->wrapWikiMsg( "
\n$1
\n", @@ -1166,13 +1164,16 @@ class Article { # Give explanation and add a link to view the revision... $oldid = intval( $this->getOldID() ); $link = $this->mTitle->getFullUrl( "oldid={$oldid}&unhide=1" ); + $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ? + 'rev-suppressed-text-unhide' : 'rev-deleted-text-unhide'; $wgOut->wrapWikiMsg( "
\n$1
\n", - array('rev-deleted-text-unhide',$link) ); + array($msg,$link) ); return false; // We are allowed to see... } else { - $wgOut->wrapWikiMsg( "
\n$1
\n", - 'rev-deleted-text-view' ); + $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ? + 'rev-suppressed-text-view' : 'rev-deleted-text-view'; + $wgOut->wrapWikiMsg( "
\n$1
\n", $msg ); return true; } } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index a716184ab6..5f857e48ad 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1415,16 +1415,21 @@ Try [[Special:Search|searching on the wiki]] for relevant new pages.', 'rev-deleted-user' => '(username removed)', 'rev-deleted-event' => '(log action removed)', 'rev-deleted-text-permission' => "This page revision has been '''deleted'''. -There may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].", +There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", 'rev-deleted-text-unhide' => "This page revision 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 revision] if you wish to proceed.", +'rev-suppressed-text-unhide' => "This page revision has been '''suppressed'''. There may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log]. As an administrator you can still [$1 view this revision] if you wish to proceed.", 'rev-deleted-text-view' => "This page revision has been '''deleted'''. +As an administrator you can view it; there may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", +'rev-suppressed-text-view' => "This page revision has been '''suppressed'''. As an administrator you can view it; there may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].", 'rev-deleted-no-diff' => "You cannot view this diff because one of the revisions has been '''deleted'''. -There may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].", +There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", 'rev-deleted-unhide-diff' => "One of the revisions of this diff has been '''deleted'''. -There may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log]. +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', -- 2.20.1