From 999ed40930a724748cb29ba322c1360c1266e01e Mon Sep 17 00:00:00 2001
From: Isarra <zhorishna@gmail.com>
Date: Thu, 18 Apr 2019 19:52:33 +0000
Subject: [PATCH] Preserve standard username label to allow customisation

Bug: T215822
Change-Id: If371deb02ea97478fd856aa4941c4715aaca7a11
---
 includes/TimelessTemplate.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/TimelessTemplate.php b/includes/TimelessTemplate.php
index 6ef560d..3ad4a0e 100644
--- a/includes/TimelessTemplate.php
+++ b/includes/TimelessTemplate.php
@@ -437,6 +437,8 @@ class TimelessTemplate extends BaseTemplate {
 	protected function getUserLinks() {
 		$user = $this->getSkin()->getUser();
 		$personalTools = $this->getPersonalTools();
+		// Preserve standard username label to allow customisation (T215822)
+		$userName = $personalTools['userpage']['links'][0]['text'] ?? $user->getName();
 
 		$html = '';
 		$extraTools = [];
@@ -462,7 +464,6 @@ class TimelessTemplate extends BaseTemplate {
 
 		// Labels
 		if ( $user->isLoggedIn() ) {
-			$userName = $user->getName();
 			// Make sure it fits first (numbers slightly made up, may need adjusting)
 			$fit = empty( $extraTools ) ? 13 : 9;
 			if ( mb_strlen( $userName ) < $fit ) {
@@ -470,7 +471,7 @@ class TimelessTemplate extends BaseTemplate {
 			} else {
 				$dropdownHeader = $this->getMsg( 'timeless-loggedin' )->text();
 			}
-			$headerMsg = [ 'timeless-loggedinas', $user->getName() ];
+			$headerMsg = [ 'timeless-loggedinas', $userName ];
 		} else {
 			$dropdownHeader = $this->getMsg( 'timeless-anonymous' )->text();
 			$headerMsg = 'timeless-notloggedin';