From d4cd7e2a44b2c19df31f7cb0ce03b957f3a359af Mon Sep 17 00:00:00 2001 From: Timm Date: Sat, 24 May 2014 00:03:48 +0200 Subject: [PATCH] Revert some stuff to use the new sanitizers. --- .../lib/action_view/helpers/sanitize_helper.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/actionview/lib/action_view/helpers/sanitize_helper.rb b/actionview/lib/action_view/helpers/sanitize_helper.rb index f205a988b4..6c1be1ef4e 100644 --- a/actionview/lib/action_view/helpers/sanitize_helper.rb +++ b/actionview/lib/action_view/helpers/sanitize_helper.rb @@ -138,16 +138,16 @@ module ClassMethods #:nodoc: end # A class to vendor out the full, link and white list sanitizers - # Can be set to either HTML::Scanner or HTML::Sanitizer + # Can be set to either HTML::Deprecated::Sanitizer or Rails::Html::Sanitizer mattr_accessor :sanitizer_vendor - self.sanitizer_vendor = HTML::Scanner + self.sanitizer_vendor = Rails::Html::Sanitizer def sanitized_allowed_tags - HTML::WhiteListSanitizer.allowed_tags + Rails::Html::WhiteListSanitizer.allowed_tags end def sanitized_allowed_attributes - HTML::WhiteListSanitizer.allowed_attributes + Rails::Html::WhiteListSanitizer.allowed_attributes end # Gets the Rails::Html::FullSanitizer instance used by +strip_tags+. Replace with @@ -190,7 +190,7 @@ def white_list_sanitizer # end # def sanitized_allowed_tags=(*tags) - HTML::WhiteListSanitizer.allowed_tags = tags + Rails::Html::WhiteListSanitizer.allowed_tags = tags end # Replaces the allowed HTML attributes for the +sanitize+ helper. @@ -200,7 +200,7 @@ def sanitized_allowed_tags=(*tags) # end # def sanitized_allowed_attributes=(*attributes) - HTML::WhiteListSanitizer.allowed_attributes = attributes + Rails::Html::WhiteListSanitizer.allowed_attributes = attributes end end end