diff options
| author | Starfall <us@starfall.systems> | 2022-03-30 12:33:18 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-03-30 12:33:18 -0500 |
| commit | f7491de676298b8f78084c00f0026f8cf36d92fc (patch) | |
| tree | 0ac29d1598efeb2a0de9bd1b54ae7590e88479da /app/helpers/accounts_helper.rb | |
| parent | f37056e6c351a08d09c3986586cc7d27bdea85ab (diff) | |
| parent | 363773d0e9ffa9f4efc564603327f225193a2bf1 (diff) | |
Update to Mastodon 2.5.0
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/helpers/accounts_helper.rb')
| -rw-r--r-- | app/helpers/accounts_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index bb2374c0e..f0becf8bd 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -2,10 +2,12 @@ module AccountsHelper def display_name(account, **options) + str = account.display_name.presence || account.username + if options[:custom_emojify] - Formatter.instance.format_display_name(account, **options) + prerender_custom_emojis(h(str), account.emojis) else - account.display_name.presence || account.username + str end end |