diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-22 08:10:31 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-22 08:10:31 -0700 |
| commit | 440a5ebd7a72fca1e655e5f4ff98435eddc4750a (patch) | |
| tree | 7286d4bc175cde9b655d10125ed8131f1476f131 /actionpack/lib | |
| parent | 1b2a7bad671cf39252dc539a673cd217a25235a8 (diff) | |
| parent | dacbcbe55745aa9e5484b10b11f65ccca7db1c54 (diff) | |
| download | rails-440a5ebd7a72fca1e655e5f4ff98435eddc4750a.tar.gz rails-440a5ebd7a72fca1e655e5f4ff98435eddc4750a.tar.bz2 rails-440a5ebd7a72fca1e655e5f4ff98435eddc4750a.zip | |
Merge pull request #7123 from nashby/data-in-options
don't escape options in option_html_attributes method
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 72fbbd109a..c88af0355f 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -711,7 +711,7 @@ module ActionView def option_html_attributes(element) return {} unless Array === element - Hash[element.select { |e| Hash === e }.reduce({}, :merge).map { |k, v| [k, ERB::Util.html_escape(v.to_s)] }] + Hash[element.select { |e| Hash === e }.reduce({}, :merge).map { |k, v| [k, v] }] end def option_text_and_value(option) |