From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 30 Oct 2018 16:06:12 +0000 (+0100)
Subject: Fix empty display name precedence over username in web UI (#9163)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f59b840549d1b4dfd02ae4f52b64149ff8de0165;p=mastodon.git

Fix empty display name precedence over username in web UI (#9163)

Fix #9131
---

diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index a2af3222e..34a4150fa 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -14,7 +14,7 @@ export function normalizeAccount(account) {
   account = { ...account };
 
   const emojiMap = makeEmojiMap(account);
-  const displayName = account.display_name.length === 0 ? account.username : account.display_name;
+  const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
 
   account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
   account.note_emojified = emojify(account.note, emojiMap);