From: Alex Z <mrzman@users.mediawiki.org>
Date: Tue, 15 Dec 2009 07:26:40 +0000 (+0000)
Subject: (bug 21814) Don't show broken user tool links when rolling back an edit that has... 
X-Git-Tag: 1.31.0-rc.0~38530
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=ad298ef865d5a0d953c9d761d79ab58448b04285;p=lhc%2Fweb%2Fwiklou.git

(bug 21814) Don't show broken user tool links when rolling back an edit that has a deleted username
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8e87f7ae63..28792086c0 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -681,6 +681,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   for namespace)
 * (bug 20765) Special:ListGroupRights no longer misses addables and removables
   groups if there are duplicate entries
+* (bug 21814) Message shown when rolling back an edit with a deleted username
+  now shows '(username deleted)' instead of broken user tool links
 
 == API changes in 1.16 ==
 
diff --git a/includes/Article.php b/includes/Article.php
index 6209041d9b..a8421a86b2 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3197,8 +3197,12 @@ class Article {
 		$newId = $details['newid'];
 		$wgOut->setPageTitle( wfMsg( 'actioncomplete' ) );
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
-		$old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
-			. $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
+		if ( $current->getUserText() === '' ) {
+			$old = wfMsg( 'rev-deleted-user' );
+		} else {
+			$old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
+				. $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
+		}
 		$new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
 			. $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
 		$wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );