diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-10-18 13:58:57 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-10-18 13:59:56 -0200 |
| commit | 330327eeecd3666a7b9b407e804b36cb1bc3cb48 (patch) | |
| tree | bb2ed398e59ef6a073ebd44f7bd09739a9a63c06 /actionpack/lib/action_view/helpers/prototype_helper.rb | |
| parent | df044ec4ace106b05a1db40a9c14addeafe0dd7a (diff) | |
| download | rails-330327eeecd3666a7b9b407e804b36cb1bc3cb48.tar.gz rails-330327eeecd3666a7b9b407e804b36cb1bc3cb48.tar.bz2 rails-330327eeecd3666a7b9b407e804b36cb1bc3cb48.zip | |
Call html_escape in ERB::Util module and don't mix it in in the helpers
Diffstat (limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 41cd8d5171..f3a429fcce 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -1,6 +1,7 @@ require 'set' require 'active_support/json' require 'active_support/core_ext/object/blank' +require 'active_support/core_ext/string/output_safety' module ActionView # = Action View Prototype Helpers @@ -131,7 +132,7 @@ module ActionView url_options = options[:url] url_options = url_options.merge(:escape => false) if url_options.is_a?(Hash) - function << "'#{html_escape(escape_javascript(url_for(url_options)))}'" + function << "'#{ERB::Util.html_escape(escape_javascript(url_for(url_options)))}'" function << ", #{javascript_options})" function = "#{options[:before]}; #{function}" if options[:before] |