nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a regression introduced by e2491680e6 (#2966) 

that caused user pages to break when showing toots with CWs
This commit is contained in:
beatrix 2017-05-10 14:32:59 -04:00 committed by Eugen Rochko
parent 43db2cf5e7
commit 57a3d71c90
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/formatter.rb
View File

@ -29,9 +29,10 @@ class Formatter
return reformat(status.spoiler_text) unless status.local? return reformat(status.spoiler_text) unless status.local?
html = status.spoiler_text html = status.spoiler_text
html = encode(html) html = encode_and_link_urls(html)
html = simple_format(html, {}, sanitize: false)
html = html.delete("\n") html = html.delete("\n")
html = link_hashtags(html)
html.html_safe # rubocop:disable Rails/OutputSafety html.html_safe # rubocop:disable Rails/OutputSafety
end end