nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Eugen Rochko 2018-05-18 15:56:57 +02:00 committed by GitHub
parent 2beeea1e7d
commit 9422b3e0d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/stream_entries_helper.rb
View File

@ -5,7 +5,11 @@ module StreamEntriesHelper
EMBEDDED_ACTION = 'embed' EMBEDDED_ACTION = 'embed'
def display_name(account, **options) def display_name(account, **options)
if options[:custom_emojify]
Formatter.instance.format_display_name(account, options) 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)