diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-10-26 05:32:30 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-10-26 05:32:30 +0000 |
| commit | d7aa32d5d04fc98730073523d429d9ce2547316a (patch) | |
| tree | c5eeb1295ec66078a99f47c98fbc73d7b7b6ef16 /actionpack/lib | |
| parent | d5a93b6241b4df64f9656853d386eca96b6f6baf (diff) | |
| download | rails-d7aa32d5d04fc98730073523d429d9ce2547316a.tar.gz rails-d7aa32d5d04fc98730073523d429d9ce2547316a.tar.bz2 rails-d7aa32d5d04fc98730073523d429d9ce2547316a.zip | |
Update tests for ActiveSupport's JSON escaping change. [rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8034 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index 7e9692be3f..9103670742 100644 --- a/actionpack/lib/action_controller/assertions/selector_assertions.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb @@ -591,6 +591,7 @@ module ActionController def unescape_rjs(rjs_string) # RJS encodes double quotes and line breaks. unescaped= rjs_string.gsub('\"', '"') + unescaped.gsub!(/\\\//, '/') unescaped.gsub!('\n', "\n") unescaped.gsub!('\076', '>') unescaped.gsub!('\074', '<') |