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/form_tag_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/form_tag_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_tag_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index ae83b6bf39..92645f5cf9 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -1,6 +1,7 @@ require 'cgi' require 'action_view/helpers/tag_helper' require 'active_support/core_ext/object/blank' +require 'active_support/core_ext/string/output_safety' module ActionView # = Action View Form Tag Helpers @@ -287,7 +288,7 @@ module ActionView end escape = options.key?("escape") ? options.delete("escape") : true - content = html_escape(content) if escape + content = ERB::Util.html_escape(content) if escape content_tag :textarea, content.to_s.html_safe, { "name" => name, "id" => sanitize_to_id(name) }.update(options) end |