From e71ac76f5edb47d9e10f8e93a62a7a8191ed4ca4 Mon Sep 17 00:00:00 2001
From: beatrix <beatrix.bitrot@gmail.com>
Date: Wed, 10 May 2017 14:32:59 -0400
Subject: [PATCH] fix a regression introduced by
 4f54465c3bb794396ded7a97a655237a0cd6624d (#2966)

that caused user pages to break when showing toots with CWs
---
 app/lib/formatter.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 7b5b8bab45..5b008278c6 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