diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-18 15:56:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 15:56:57 +0200 |
| commit | 9422b3e0d8a06044658cf15f8fffae43fabb5684 (patch) | |
| tree | cfa67774e61ab8ead098da4202c874d0d9eab0c3 /app | |
| parent | 2beeea1e7d023c87130a41d344ed2be91294eaf1 (diff) | |
Fix double-encoding of display name in title and e-mails (#7534)
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 707c8e26c..a91a28935 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -5,7 +5,11 @@ module StreamEntriesHelper EMBEDDED_ACTION = 'embed' def display_name(account, **options) - Formatter.instance.format_display_name(account, options) + if options[:custom_emojify] + Formatter.instance.format_display_name(account, options) + else + account.display_name.presence || account.username + end end def account_description(account) |