about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorNaoki Kosaka <n.k@mail.yukimochi.net>2017-09-20 00:55:48 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-09-19 17:55:48 +0200
commitdf1ce2350ccbedf145ad9a1b98582610cea80604 (patch)
tree882006c2936dcc835a92bb6ef0c6a4af84ee16a2 /app/lib
parente5c65b30670e7dee62fd6ecc816345c0de2672e6 (diff)
Fix non-local statuses are html_encoded in public_page. (#5012)
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/formatter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 29fea27de..8d69cb948 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -22,7 +22,7 @@ class Formatter
     unless status.local?
       html = reformat(raw_content)
       html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify]
-      return html
+      return html.html_safe # rubocop:disable Rails/OutputSafety
     end
 
     linkable_accounts = status.mentions.map(&:account)
@@ -39,7 +39,7 @@ class Formatter
   end
 
   def reformat(html)
-    sanitize(html, Sanitize::Config::MASTODON_STRICT).html_safe # rubocop:disable Rails/OutputSafety
+    sanitize(html, Sanitize::Config::MASTODON_STRICT)
   end
 
   def plaintext(status)