github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #275 from pk-amooma/master"

Browse Source 
Several AP tests fail after this change.

This reverts commit aaf01cd537, reversing
changes made to 9cc18c52fa.
This commit is contained in:
José Valim
2011-05-07 23:45:15 +02:00
parent 0a1ba4eab0
commit 0ef978d1d2
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
activesupport/lib/active_support/core_ext/string/output_safety.rb
View File

@@ -3,7 +3,7 @@ require 'active_support/core_ext/kernel/singleton_class'
class ERB
module Util
XML_ESCAPE = { '&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;', "'" => '&apos;' }
HTML_ESCAPE = { '&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;' }
JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
# A utility method for escaping HTML tag characters.
@@ -20,7 +20,7 @@ class ERB
if s.html_safe?
s
else
s.gsub(/[&"'><]/) { |special| XML_ESCAPE[special] }.html_safe
s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }.html_safe
end
end

12
activesupport/test/core_ext/string_ext_test.rb
View File

@@ -387,18 +387,6 @@ class OutputSafetyTest < ActiveSupport::TestCase
assert !@other_combination.html_safe?
end
test "Escapes special HTML/XML characters" do
@other_string = "other".html_safe
@combination = @other_string + "<foo>&\"'"
@other_combination = @string + "<foo>&\"'"
assert_equal "other&lt;foo&gt;&amp;&quot;&apos;", @combination
assert_equal "hello<foo>&\"'", @other_combination
assert @combination.html_safe?
assert !@other_combination.html_safe?
end
test "Concatting safe onto unsafe yields unsafe" do
@other_string = "other"