github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 02:09:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

work around bust encodings passed in to method

Browse Source
This commit is contained in:
Sam 2013-11-05 13:40:39 +11:00
parent 3bdd2eeeba
commit 415d4df648
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/application_helper.rb
View File

@ -26,6 +26,13 @@ module ApplicationHelper
def escape_unicode(javascript) def escape_unicode(javascript)
if javascript if javascript
javascript = javascript.dup.force_encoding("utf-8") 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.gsub!(/\342\200\250/u, '
') javascript.gsub!(/\342\200\250/u, '
')
javascript.gsub!(/(<\/)/u, '\u003C/') javascript.gsub!(/(<\/)/u, '\u003C/')
javascript.html_safe javascript.html_safe

11
spec/helpers/application_helper_spec.rb
View File

@ -2,7 +2,16 @@ require 'spec_helper'
describe ApplicationHelper do describe ApplicationHelper do
describe 'mobile_view?' do describe "escape_unicode" do
it "encodes tags" do
helper.escape_unicode("<tag>").should == "\u003ctag>"
end
it "survives junk text" do
helper.escape_unicode("hello \xc3\x28 world").should =~ /hello.*world/
end
end
describe "mobile_view?" do
context "enable_mobile_theme is true" do context "enable_mobile_theme is true" do
before do before do
SiteSetting.stubs(:enable_mobile_theme).returns(true) SiteSetting.stubs(:enable_mobile_theme).returns(true)