From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 6 Apr 2011 18:23:07 +0000 (+0000)
Subject: * (bug 28306) Fix exposure of suppressed usernames in ForeignDBRepo
X-Git-Tag: 1.31.0-rc.0~30996
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=2073ab9b7fb4c40bc2b92198d612c01d4acc32d7;p=lhc%2Fweb%2Fwiklou.git

* (bug 28306) Fix exposure of suppressed usernames in ForeignDBRepo

Patch by Umherirrender: https://bugzilla.wikimedia.org/attachment.cgi?id=8360&action=diff
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 052b315bfb..7105e791a0 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -229,6 +229,7 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 28394) Set forgotten parameters types in ApiUnblock
 * (bug 28395) Set forgotten parameters types in ApiParse
 * (bug 28430) Make html and TeX output of <math> always be left-to-right.
+* (bug 28306) Fix exposure of suppressed usernames in ForeignDBRepo
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 176c97d03e..b1304f5ba0 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -1079,16 +1079,16 @@ class ImageHistoryList {
 
 		// Uploading user
 		$row .= '<td>';
-		if ( $local ) {
-			// Hide deleted usernames
-			if ( $file->isDeleted( File::DELETED_USER ) ) {
-				$row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
-			} else {
+		// Hide deleted usernames
+		if ( $file->isDeleted( File::DELETED_USER ) ) {
+			$row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+		} else {
+			if ( $local ) {
 				$row .= $this->skin->userLink( $user, $usertext ) . ' <span style="white-space: nowrap;">' .
-					$this->skin->userToolLinks( $user, $usertext ) . '</span>';
+				$this->skin->userToolLinks( $user, $usertext ) . '</span>';
+			} else {
+				$row .= htmlspecialchars( $usertext );
 			}
-		} else {
-			$row .= htmlspecialchars( $usertext );
 		}
 		$row .= '</td><td>';