diff options
| author | Ryan Bigg <radarlistener@gmail.com> | 2008-11-18 10:40:50 +1030 |
|---|---|---|
| committer | Ryan Bigg <radarlistener@gmail.com> | 2008-11-18 10:40:50 +1030 |
| commit | 9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b (patch) | |
| tree | a88985f50190dad0f26044b2db0cf7b1a92355e5 /actionpack/lib/action_controller/vendor/html-scanner | |
| parent | 451969f57a6dfee8537fb10d179514e011559111 (diff) | |
| parent | c62f973c749beac8947ff5119af43fbde2547eb1 (diff) | |
| download | rails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.tar.gz rails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.tar.bz2 rails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/vendor/html-scanner')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb index 12c8405101..ae20f9947c 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb @@ -160,7 +160,7 @@ module HTML if !options[:attributes].include?(attr_name) || contains_bad_protocols?(attr_name, value) node.attributes.delete(attr_name) else - node.attributes[attr_name] = attr_name == 'style' ? sanitize_css(value) : CGI::escapeHTML(value) + node.attributes[attr_name] = attr_name == 'style' ? sanitize_css(value) : CGI::escapeHTML(CGI::unescapeHTML(value)) end end end |