jenkins-bot has submitted this change and it was merged.

Change subject: Avoid double word-separator when using Linker::userToolLinks
......................................................................


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
---
M includes/Linker.php
M includes/page/ImagePage.php
M includes/specials/SpecialFileDuplicateSearch.php
3 files changed, 0 insertions(+), 3 deletions(-)

Approvals:
  Raimond Spekking: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Linker.php b/includes/Linker.php
index 238bb53..11f73f6 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1251,7 +1251,6 @@
                        $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 b8f67c2..855f233 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -1365,7 +1365,6 @@
                } 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 607b4f6..606f837 100644
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -212,7 +212,6 @@
                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>';

-- 
To view, visit https://gerrit.wikimedia.org/r/190243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9d3125b9cae4a92f489215dda0b32c487f3fb11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: IAlex <coderev...@emsenhuber.ch>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to