diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-17 21:22:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-17 21:22:00 -0300 |
| commit | 20425986d1d90e9497b16a3780efd507293d401c (patch) | |
| tree | 268a11144c9cf80d5ed4d8a5114cd33d4ee022e5 /actionview/lib | |
| parent | a2400308eab88b5eff27e05d1f7624345fb33b54 (diff) | |
| parent | 1e2ffe7ae67c37cf8170be0c864cbdaacc27c1b4 (diff) | |
| download | rails-20425986d1d90e9497b16a3780efd507293d401c.tar.gz rails-20425986d1d90e9497b16a3780efd507293d401c.tar.bz2 rails-20425986d1d90e9497b16a3780efd507293d401c.zip | |
Merge pull request #16525 from kaspth/partial-release-prep
Prepare for partial release.
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/sanitize_helper.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/actionview/lib/action_view/helpers/sanitize_helper.rb b/actionview/lib/action_view/helpers/sanitize_helper.rb index 2268fe25c1..153c64d691 100644 --- a/actionview/lib/action_view/helpers/sanitize_helper.rb +++ b/actionview/lib/action_view/helpers/sanitize_helper.rb @@ -1,6 +1,6 @@ require 'active_support/core_ext/object/try' require 'active_support/deprecation' -require 'rails-html-sanitizer' +require 'rails-deprecated_sanitizer' module ActionView # = Action View Sanitize Helpers @@ -138,9 +138,14 @@ module ActionView end # Vendors the full, link and white list sanitizers. - # Strictly for backwards compatibility with html-scanner. + # This uses html-scanner for the HTML sanitization. + # In the next Rails version this will use Rails::Html::Sanitizer instead. + # To get this new behavior now, in your Gemfile, add: + # + # gem 'rails-html-sanitizer' + # def sanitizer_vendor - Rails::Html::Sanitizer + Rails::DeprecatedSanitizer end def sanitized_allowed_tags |