logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 1244630ab40c582c0ffa8ce0aadf93ae04209253
parent: a9a4710fe17b6b3b9657d370d0dc5062ef25c7ab
Author: 178inaba <magic.brain.evolution.7.0@gmail.com>
Date:   Sun, 23 Apr 2017 21:23:27 +0900

Add simple_format to simplified_format (#2198)


Diffstat:

Mapp/lib/formatter.rb2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git 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)