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/admin | |
| parent | 2287eebae0c1d699436a8cf3218d7cfe990a3605 (diff) | |
| parent | 8d6f3f8a379c8d552d2101cf35ae8f6fe956da53 (diff) | |
Merge pull request #1724 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/admin')
| -rw-r--r-- | app/helpers/admin/trends/statuses_helper.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/helpers/admin/trends/statuses_helper.rb b/app/helpers/admin/trends/statuses_helper.rb index d16e3dd12..214c1e2a6 100644 --- a/app/helpers/admin/trends/statuses_helper.rb +++ b/app/helpers/admin/trends/statuses_helper.rb @@ -12,9 +12,6 @@ module Admin::Trends::StatusesHelper return '' if text.blank? - html = Formatter.instance.send(:encode, text) - html = Formatter.instance.send(:encode_custom_emojis, html, status.emojis, prefers_autoplay?) - - html.html_safe # rubocop:disable Rails/OutputSafety + prerender_custom_emojis(h(text), status.emojis) end end |