mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 00:54:49 +01:00
Code Issues Projects Releases Wiki Activity

Add simple_format to simplified_format (#2198)

Browse Source
This commit is contained in:
178inaba 2017-04-23 21:23:27 +09:00 committed by Eugen
parent a9a4710fe1
commit 1244630ab4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/formatter.rb
View File

@ -35,6 +35,8 @@ class Formatter
return reformat(account.note) unless account.local? return reformat(account.note) unless account.local?
html = encode_and_link_urls(account.note) html = encode_and_link_urls(account.note)
html = simple_format(html, {}, sanitize: false)
html = html.delete("\n")
html = link_accounts(html) html = link_accounts(html)
html = link_hashtags(html) html = link_hashtags(html)