about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
author178inaba <magic.brain.evolution.7.0@gmail.com>2017-04-23 21:23:27 +0900
committerEugen <eugen@zeonfederated.com>2017-04-23 14:23:27 +0200
commit1244630ab40c582c0ffa8ce0aadf93ae04209253 (patch)
tree6b1eb4da04af59e1cf2689e0f632e449861d3ce0 /app/lib
parenta9a4710fe17b6b3b9657d370d0dc5062ef25c7ab (diff)
Add simple_format to simplified_format (#2198)
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/formatter.rb2
1 files changed, 2 insertions, 0 deletions
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)