aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-27 19:31:24 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-27 19:31:24 -0700
commit771b76a3dc75075b3cb777da96c11aa73425dbf6 (patch)
treed15ce3e63c9b593ab66033038b9f2003262bee27
parent41c8277a9b04dda40972bbafa2dbfc00c5c238fb (diff)
parent1bd88fdafd9cd0c1c83e8bf41020d0c251cb3108 (diff)
downloadrails-771b76a3dc75075b3cb777da96c11aa73425dbf6.tar.gz
rails-771b76a3dc75075b3cb777da96c11aa73425dbf6.tar.bz2
rails-771b76a3dc75075b3cb777da96c11aa73425dbf6.zip
Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require
add missing require to html sanitizer
-rw-r--r--actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb1
1 files changed, 1 insertions, 0 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 eaefdc0f15..af06bffa16 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
@@ -1,4 +1,5 @@
require 'set'
+require 'cgi'
require 'active_support/core_ext/class/attribute'
module HTML