github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:11:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: backport a minimal String#scrub

Browse Source 
BUGFIX: invalid byte sequence in email would explode all processing
This commit is contained in:
Sam
2013-12-30 14:05:25 +11:00
parent 81eec5ff06
commit 9738c4ff48
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/helpers/application_helper.rb
View File

@ -25,14 +25,7 @@ module ApplicationHelper
def escape_unicode(javascript)
if javascript
javascript = javascript.dup.force_encoding("utf-8")
unless javascript.valid_encoding?
# work around bust string with a double conversion
javascript.encode!("utf-16","utf-8",:invalid => :replace)
javascript.encode!("utf-8","utf-16")
end
javascript = javascript.scrub
javascript.gsub!(/\342\200\250/u, '
')
javascript.gsub!(/(<\/)/u, '\u003C/')
javascript.html_safe