]> cat aescling's git repositories - mastodon.git/commitdiff
Add simple_format to simplified_format (#2198)
author178inaba <magic.brain.evolution.7.0@gmail.com>
Sun, 23 Apr 2017 12:23:27 +0000 (21:23 +0900)
committerEugen <eugen@zeonfederated.com>
Sun, 23 Apr 2017 12:23:27 +0000 (14:23 +0200)
app/lib/formatter.rb

index f539512a55fab76c8b9809329fa65612da22f408..12e79c9b1f929470aaeaadc7347cd577441d938c 100644 (file)
@@ -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)