diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-29 16:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 16:39:43 +0200 |
| commit | eaea849035ea407afb2d5db411dbddc1ccca6f44 (patch) | |
| tree | 19a0b6e761fc453fac2f5a8aba24595ad93f0382 /app/helpers/accounts_helper.rb | |
| parent | 2287eebae0c1d699436a8cf3218d7cfe990a3605 (diff) | |
| parent | 8d6f3f8a379c8d552d2101cf35ae8f6fe956da53 (diff) | |
Merge pull request #1724 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 |