github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 23:33:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4418 from mpalmer/scrub-fixes

Browse Source 
Scrub only after converting strings to UTF-8
This commit is contained in:
Matt Palmer 2016-08-25 16:27:51 +10:00 committed by GitHub
commit d72730fed5
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/jobs/scheduled/poll_feed.rb
View File

@ -86,11 +86,11 @@ module Jobs
end end
def content def content
@article_rss_item.content.try(:scrub) || @article_rss_item.description.try(:scrub) @article_rss_item.content.try(:force_encoding, "UTF-8").try(:scrub) || @article_rss_item.description.try(:force_encoding, "UTF-8").try(:scrub)
end end
def title def title
@article_rss_item.title.scrub @article_rss_item.title.force_encoding("UTF-8").scrub
end end
def user def user