last tweak for bug 21352 (RevDelete messages)

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index d35503c..9cb8570 100644 (file)
--- 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 4842ef7..995f680 100644 (file)
--- 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 3d1f845..1abe886 100644 (file)
--- 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 156c5c6..1635e40 100644 (file)
--- 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',