aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorVasiliy Ermolovich <younash@gmail.com>2012-07-21 13:34:03 +0300
committerVasiliy Ermolovich <younash@gmail.com>2012-07-22 11:37:54 +0300
commitdacbcbe55745aa9e5484b10b11f65ccca7db1c54 (patch)
tree9fb1d84730a91563fe135922c5d3e65dba221e91 /actionpack/lib
parent98f4aee8dac22d9e9bb3c122b43e9e5ee8ba7d1c (diff)
downloadrails-dacbcbe55745aa9e5484b10b11f65ccca7db1c54.tar.gz
rails-dacbcbe55745aa9e5484b10b11f65ccca7db1c54.tar.bz2
rails-dacbcbe55745aa9e5484b10b11f65ccca7db1c54.zip
don't escape options in option_html_attributes method
we don't need to escape values in this method as we pass these html attributes to `tag_options` method that handle escaping as well. it fixes the case when we want to pass html5 data options
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/form_options_helper.rb2
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)