about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2017-05-10 14:32:59 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-05-10 20:32:59 +0200
commit57a3d71c90844a140ee8d6c1cdded67a4565c6ca (patch)
tree2ac355783aa2f9dca3c75802884478b189d90d36 /app/lib
parent43db2cf5e7e72ca4c16f94dd6e60fadc725da747 (diff)
fix a regression introduced by e2491680e696d2c285a798ec4c66b26d2748df66 (#2966)
that caused user pages to break when showing toots with CWs
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/formatter.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 7b5b8bab4..5b008278c 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -29,9 +29,10 @@ class Formatter
     return reformat(status.spoiler_text) unless status.local?
 
     html = status.spoiler_text
-    html = encode(html)
+    html = encode_and_link_urls(html)
+
+    html = simple_format(html, {}, sanitize: false)
     html = html.delete("\n")
-    html = link_hashtags(html)
 
     html.html_safe # rubocop:disable Rails/OutputSafety
   end