treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

fix a regression introduced by 4f54465c3b (#2966) 

that caused user pages to break when showing toots with CWs
lolsob-rspec
beatrix 2017-05-10 14:32:59 -04:00 committed by Eugen Rochko
parent 04ee7e7b62
commit e71ac76f5e
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