diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-11 12:14:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-11 12:14:29 +0200 |
| commit | 32762f2fa864d8f56dfba59e8b5ff6ccf03aecb6 (patch) | |
| tree | d7143f63d6fc7d0d6d817d61f2fcc335fe4aba7a /app/helpers/application_helper.rb | |
| parent | e8b8ac8908c6623f0fd7ffccc7de3882a773b72f (diff) | |
| parent | 6fb837aa1d34fbafda1fe561d1a3789ac281d27c (diff) | |
Merge pull request #1767 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1c670fde0..b26e68c4d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -244,7 +244,7 @@ module ApplicationHelper end.values end - def prerender_custom_emojis(html, custom_emojis) - EmojiFormatter.new(html, custom_emojis, animate: prefers_autoplay?).to_s + def prerender_custom_emojis(html, custom_emojis, other_options = {}) + EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s end end |