diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-05 13:43:43 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-05 13:43:43 -0800 |
| commit | 55fbc19b5ff062bdd96c81532311e897ecb2a996 (patch) | |
| tree | 02fe9b3ab8941668e2cc808c5dbdeb404b1fa07c | |
| parent | b2b2eb3d3f68d94ebeb9bcc0f5ad60f7b2e45bfa (diff) | |
| parent | ad0336e528c053e9fcea7b1c1721b1d0e643483f (diff) | |
| download | rails-55fbc19b5ff062bdd96c81532311e897ecb2a996.tar.gz rails-55fbc19b5ff062bdd96c81532311e897ecb2a996.tar.bz2 rails-55fbc19b5ff062bdd96c81532311e897ecb2a996.zip | |
Merge pull request #4335 from lest/useless-multibyte-clean
remove use of Multibyte.clean as it's no-op in ruby 1.9
| -rw-r--r-- | actionpack/lib/action_view/helpers/tag_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb index 8c33ef09fa..93a3c40683 100644 --- a/actionpack/lib/action_view/helpers/tag_helper.rb +++ b/actionpack/lib/action_view/helpers/tag_helper.rb @@ -118,7 +118,7 @@ module ActionView # escape_once("<< Accept & Checkout") # # => "<< Accept & Checkout" def escape_once(html) - ActiveSupport::Multibyte.clean(html.to_s).gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] } + html.to_s.gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] } end private |