From: umherirrender <umherirrender_de.wp@web.de>
Date: Thu, 12 Feb 2015 17:54:18 +0000 (+0100)
Subject: Avoid double word-separator when using Linker::userToolLinks
X-Git-Tag: 1.31.0-rc.0~12349^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=6dcb4408c724484faf1c2181e34026c8a727d94a;p=lhc%2Fweb%2Fwiklou.git

Avoid double word-separator when using Linker::userToolLinks

The word-separator is already part of the return value of
Linker::userToolLinks which results in a double space when add an own
word-separator

Change-Id: Id9d3125b9cae4a92f489215dda0b32c487f3fb11
---

diff --git a/includes/Linker.php b/includes/Linker.php
index 238bb5348a..11f73f6818 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1251,7 +1251,6 @@ class Linker {
 			$userId = $rev->getUser( Revision::FOR_THIS_USER );
 			$userText = $rev->getUserText( Revision::FOR_THIS_USER );
 			$link = self::userLink( $userId, $userText )
-				. wfMessage( 'word-separator' )->escaped()
 				. self::userToolLinks( $userId, $userText );
 		} else {
 			$link = wfMessage( 'rev-deleted-user' )->escaped();
diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index b8f67c2e2c..855f233913 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -1365,7 +1365,6 @@ class ImageHistoryList extends ContextSource {
 		} else {
 			if ( $local ) {
 				$row .= Linker::userLink( $userId, $userText );
-				$row .= $this->msg( 'word-separator' )->escaped();
 				$row .= '<span style="white-space: nowrap;">';
 				$row .= Linker::userToolLinks( $userId, $userText );
 				$row .= '</span>';
diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php
index 607b4f6f12..606f83777a 100644
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -212,7 +212,6 @@ class FileDuplicateSearchPage extends QueryPage {
 		if ( $result->isLocal() ) {
 			$userId = $result->getUser( 'id' );
 			$user = Linker::userLink( $userId, $userText );
-			$user .= $this->getContext()->msg( 'word-separator' )->escaped();
 			$user .= '<span style="white-space: nowrap;">';
 			$user .= Linker::userToolLinks( $userId, $userText );
 			$user .= '</span>';