diff options
| author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2010-11-19 18:29:33 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-11-20 19:40:29 +0100 |
| commit | d7db6a88734c3b666f4b85f266d223eff408b294 (patch) | |
| tree | ccfa0ed1a0e92b9c3324bf92f92391f2d20be95c /actionpack/lib/action_controller/vendor/html-scanner/html | |
| parent | 8d8062190ddd0452088f6ea917267ed993a70990 (diff) | |
| download | rails-d7db6a88734c3b666f4b85f266d223eff408b294.tar.gz rails-d7db6a88734c3b666f4b85f266d223eff408b294.tar.bz2 rails-d7db6a88734c3b666f4b85f266d223eff408b294.zip | |
class inheritable attributes is used no more! all internal use of class inheritable has been changed to class_attribute. class inheritable attributes has been deprecated.
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller/vendor/html-scanner/html')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb | 4 |
1 files changed, 2 insertions, 2 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 dceddb9b80..3e5d23b5c1 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb @@ -1,5 +1,5 @@ require 'set' -require 'active_support/core_ext/class/inheritable_attributes' +require 'active_support/core_ext/class/attribute' module HTML class Sanitizer @@ -60,7 +60,7 @@ module HTML class WhiteListSanitizer < Sanitizer [:protocol_separator, :uri_attributes, :allowed_attributes, :allowed_tags, :allowed_protocols, :bad_tags, :allowed_css_properties, :allowed_css_keywords, :shorthand_css_properties].each do |attr| - class_inheritable_accessor attr, :instance_writer => false + class_attribute attr, :instance_writer => false end # A regular expression of the valid characters used to separate protocols like |