diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-07 23:45:15 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-07 23:45:15 +0200 |
| commit | 0ef978d1d2fc44134ccda2a21ec6f1984fb0b699 (patch) | |
| tree | 9513a79b8c2915cf0e7995c62259da1a53643f5c /activesupport/lib/active_support/core_ext/string/output_safety.rb | |
| parent | 0a1ba4eab0c442f3e9f4027e4b5d3418f8eb6ca4 (diff) | |
| download | rails-0ef978d1d2fc44134ccda2a21ec6f1984fb0b699.tar.gz rails-0ef978d1d2fc44134ccda2a21ec6f1984fb0b699.tar.bz2 rails-0ef978d1d2fc44134ccda2a21ec6f1984fb0b699.zip | |
Revert "Merge pull request #275 from pk-amooma/master"
Several AP tests fail after this change.
This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing
changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/string/output_safety.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index 6f410819ba..c27cbc37c5 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -3,7 +3,7 @@ require 'active_support/core_ext/kernel/singleton_class' class ERB module Util - XML_ESCAPE = { '&' => '&', '>' => '>', '<' => '<', '"' => '"', "'" => ''' } + HTML_ESCAPE = { '&' => '&', '>' => '>', '<' => '<', '"' => '"' } 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 |