From 5ea45351a0c3258a4e783e9f9b570e24b9c58d78 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 18 Jun 2019 19:54:36 +0200 Subject: Fix rendering of emoji in public pages --- app/lib/formatter.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/lib') diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 8a2828bbf..4c11ca291 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -59,11 +59,10 @@ class Formatter html = "RT @#{prepend_reblog} #{html}" if prepend_reblog html = format_markdown(html) if status.content_type == 'text/markdown' html = encode_and_link_urls(html, linkable_accounts, keep_html: %w(text/markdown text/html).include?(status.content_type)) + html = reformat(html) if %w(text/markdown text/html).include?(status.content_type) html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify] - if %w(text/markdown text/html).include?(status.content_type) - html = reformat(html) - else + unless %w(text/markdown text/html).include?(status.content_type) html = simple_format(html, {}, sanitize: false) html = html.delete("\n") end -- cgit