Fix double-encoding of display name in title and e-mails (#7534)
This commit is contained in:
parent
2beeea1e7d
commit
9422b3e0d8
1 changed files with 5 additions and 1 deletions
|
@ -5,7 +5,11 @@ module StreamEntriesHelper
|
||||||
EMBEDDED_ACTION = 'embed'
|
EMBEDDED_ACTION = 'embed'
|
||||||
|
|
||||||
def display_name(account, **options)
|
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
|
end
|
||||||
|
|
||||||
def account_description(account)
|
def account_description(account)
|
||||||
|
|
Loading…
Reference in a new issue