From: 178inaba <magic.brain.evolution.7.0@gmail.com>
Date: Sun, 23 Apr 2017 12:23:27 +0000 (+0900)
Subject: Add simple_format to simplified_format (#2198)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1244630ab40c582c0ffa8ce0aadf93ae04209253;p=mastodon.git

Add simple_format to simplified_format (#2198)
---

diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index f539512a5..12e79c9b1 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -35,6 +35,8 @@ class Formatter
     return reformat(account.note) unless account.local?
 
     html = encode_and_link_urls(account.note)
+    html = simple_format(html, {}, sanitize: false)
+    html = html.delete("\n")
     html = link_accounts(html)
     html = link_hashtags(html)