Unverified Commit 9422b3e0 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Fix double-encoding of display name in title and e-mails (#7534)

parent 2beeea1e
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment