diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-30 20:10:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 20:10:09 +0100 |
| commit | 08c0f8b67c7316b020c5623c69d02665146ebd57 (patch) | |
| tree | 9411daf86f412a69c2536cfc302b484bd3ea16ae /app/javascript/flavours/glitch | |
| parent | 7e18e95716052d5566f2e31559cbe4a68268f493 (diff) | |
| parent | 0d6b8f36aaee9c8c68c64ce4a63bcc66c6faf78d (diff) | |
Merge pull request #802 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/accounts.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/accounts.js b/app/javascript/flavours/glitch/reducers/accounts.js index c2f016a87..860c13534 100644 --- a/app/javascript/flavours/glitch/reducers/accounts.js +++ b/app/javascript/flavours/glitch/reducers/accounts.js @@ -72,7 +72,7 @@ const normalizeAccount = (state, account) => { delete account.statuses_count; 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); |