From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 18 Nov 2009 20:50:00 +0000 (+0000)
Subject: last tweak for bug 21352 (RevDelete messages)
X-Git-Tag: 1.31.0-rc.0~38763
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=b11f888894eef09a8b749c0a1f20b922380a684d;p=lhc%2Fweb%2Fwiklou.git

last tweak for bug 21352 (RevDelete messages)
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index d35503cc83..9cb8570889 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -645,7 +645,7 @@ class ContribsPager extends ReverseChronologicalPager {
 		
 		# Denote if username is redacted for this edit
 		if( $rev->isDeleted( Revision::DELETED_USER ) ) {
-			$ret .= " <strong>" . wfMsgHtml('rev-deleted-user') . "</strong>";
+			$ret .= " <strong>" . wfMsgHtml('rev-deleted-user-contribs') . "</strong>";
 		}
 
 		# Tags, if any.
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 4842ef7c26..995f680125 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -123,7 +123,7 @@ class DeletedContribsPager extends IndexPager {
 				'user_text'  => $row->ar_user_text,
 				'timestamp'  => $row->ar_timestamp,
 				'minor_edit' => $row->ar_minor_edit,
-				'deleted' => $row->ar_deleted,
+				'deleted'    => $row->ar_deleted,
 				) );
 
 		$page = Title::makeTitle( $row->ar_namespace, $row->ar_title );
@@ -212,12 +212,15 @@ class DeletedContribsPager extends IndexPager {
 			array( 'class' => 'mw-deletedcontribs-tools' ),
 			wfMsg( 'parentheses', $wgLang->pipeList( array( $last, $dellog, $reviewlink ) ) )
 		);
+		
+		$ret = "{$del}{$link} {$tools} . . {$mflag} {$pagelink} {$comment}";
+		
+		# Denote if username is redacted for this edit
+		if( $rev->isDeleted( Revision::DELETED_USER ) ) {
+			$ret .= " <strong>" . wfMsgHtml('rev-deleted-user-contribs') . "</strong>";
+		}
 
-		$ret = Html::rawElement(
-			'li',
-			array(),
-			"{$del}{$link} {$tools} . . {$mflag} {$pagelink} {$comment}"
-		) . "\n";
+		$ret = Html::rawElement( 'li', array(), $ret ) . "\n";
 
 		wfProfileOut( __METHOD__ );
 		return $ret;
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 3d1f84513a..1abe8866f5 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1427,6 +1427,7 @@ Try [[Special:Search|searching on the wiki]] for relevant new pages.',
 'rev-deleted-comment'         => '(comment removed)',
 'rev-deleted-user'            => '(username removed)',
 'rev-deleted-event'           => '(log action removed)',
+'rev-deleted-user-contribs'   => '[username or IP removed - edit hidden from contributions]',
 'rev-deleted-text-permission' => "This page revision has been '''deleted'''.
 There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].",
 'rev-deleted-text-unhide'     => "This page revision has been '''deleted'''.
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 156c5c6135..1635e40e3e 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -670,6 +670,7 @@ $wgMessageStructure = array(
 		'rev-suppressed-unhide-diff',
 		'rev-deleted-diff-view',
 		'rev-suppressed-diff-view',
+		'rev-deleted-user-contribs',
 		'rev-delundel',
 		'rev-showdeleted',
 		'revisiondelete',