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/views/statuses/_poll.html.haml | |
| parent | 2287eebae0c1d699436a8cf3218d7cfe990a3605 (diff) | |
| parent | 8d6f3f8a379c8d552d2101cf35ae8f6fe956da53 (diff) | |
Merge pull request #1724 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/statuses/_poll.html.haml')
| -rw-r--r-- | app/views/statuses/_poll.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml index 3546a923e..d0f264095 100644 --- a/app/views/statuses/_poll.html.haml +++ b/app/views/statuses/_poll.html.haml @@ -12,7 +12,7 @@ %span.poll__number>< = "#{percent.round}%" %span.poll__option__text - = Formatter.instance.format_poll_option(status, option, autoplay: prefers_autoplay?) + = prerender_custom_emojis(h(option.title), status.emojis) - if own_votes.include?(index) %span.poll__voted %i.poll__voted__mark.fa.fa-check @@ -23,7 +23,7 @@ %label.poll__option>< %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}>< %span.poll__option__text - = Formatter.instance.format_poll_option(status, option, autoplay: prefers_autoplay?) + = prerender_custom_emojis(h(option.title), status.emojis) .poll__footer - unless show_results %button.button.button-secondary{ disabled: true } |