ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-local statuses are html_encoded in public_page. (#5012)

rebase/4.0.0rc2
Naoki Kosaka 2017-09-20 00:55:48 +09:00 committed by Eugen Rochko
parent e5c65b3067
commit df1ce2350c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/formatter.rb
View File

@ -22,7 +22,7 @@ class Formatter
unless status.local? unless status.local?
html = reformat(raw_content) html = reformat(raw_content)
html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify] html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify]
return html return html.html_safe # rubocop:disable Rails/OutputSafety
end end
linkable_accounts = status.mentions.map(&:account) linkable_accounts = status.mentions.map(&:account)
@ -39,7 +39,7 @@ class Formatter
end end
def reformat(html) def reformat(html)
sanitize(html, Sanitize::Config::MASTODON_STRICT).html_safe # rubocop:disable Rails/OutputSafety sanitize(html, Sanitize::Config::MASTODON_STRICT)
end end
def plaintext(status) def plaintext(status)