From 3d104f3fd0b7ba62c0e234e86e85944605ad4635 Mon Sep 17 00:00:00 2001
From: Alex Monk <krenair@gmail.com>
Date: Sat, 18 May 2013 00:31:25 +0100
Subject: [PATCH] Fix undo edit summary when the user who made the old revision
 is hidden

Bug: 48571
Change-Id: I01b034b25032dbbfb67c7f578b501bda746d5335
---
 includes/EditPage.php              | 14 +++++++++++++-
 languages/messages/MessagesEn.php  |  1 +
 languages/messages/MessagesQqq.php |  2 ++
 maintenance/language/messages.inc  |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 27f4556bf7..bb2bb3cbb7 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -935,7 +935,19 @@ class EditPage {
 							# If we just undid one rev, use an autosummary
 							$firstrev = $oldrev->getNext();
 							if ( $firstrev && $firstrev->getId() == $undo ) {
-								$undoSummary = wfMessage( 'undo-summary', $undo, $undorev->getUserText() )->inContentLanguage()->text();
+								$userText = $undorev->getUserText();
+								if ( $userText === '' ) {
+									$undoSummary = wfMessage(
+										'undo-summary-username-hidden',
+										$undo
+									)->inContentLanguage()->text();
+								} else {
+									$undoSummary = wfMessage(
+										'undo-summary',
+										$undo,
+										$userText
+									)->inContentLanguage()->text();
+								}
 								if ( $this->summary === '' ) {
 									$this->summary = $undoSummary;
 								} else {
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 4cc00da05f..0af077cb1e 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1577,6 +1577,7 @@ Please check the comparison below to verify that this is what you want to do, an
 'undo-failure' => 'The edit could not be undone due to conflicting intermediate edits.',
 'undo-norev'   => 'The edit could not be undone because it does not exist or was deleted.',
 'undo-summary' => 'Undo revision $1 by [[Special:Contributions/$2|$2]] ([[User talk:$2|talk]])',
+'undo-summary-username-hidden' => 'Undo revision $1 by a hidden user',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Cannot create account',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 5d001bce2f..04516ea7ed 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1829,6 +1829,8 @@ See also:
 
 {{Identical|Undo}}',
 'undo-summary' => 'Edit summary for an undo action.{{Identical|Undo}}',
+'undo-summary-username-hidden' => 'Edit summary for an undo action where the username of the old revision is hidden.
+$1 is the revision ID being undone',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Used as title of the error message {{msg-mw|Cantcreateaccount-text}}.',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 050b86ef6d..1c3dcbad92 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -766,6 +766,7 @@ $wgMessageStructure = array(
 		'undo-failure',
 		'undo-norev',
 		'undo-summary',
+		'undo-summary-username-hidden',
 	),
 	'cantcreateaccount' => array(
 		'cantcreateaccounttitle',
-- 
2.20.1