From 9422b3e0d8a06044658cf15f8fffae43fabb5684 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 18 May 2018 15:56:57 +0200 Subject: [PATCH] Fix double-encoding of display name in title and e-mails (#7534) --- app/helpers/stream_entries_helper.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 707c8e26ce..a91a289355 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)