aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_options_helper.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-10 13:17:20 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-10 13:17:20 -0700
commit89dc4813520c38e4ec62d3ab9b8fda8254987327 (patch)
tree625f75aa0704a40f9205963b85f4cde64f347577 /actionpack/lib/action_view/helpers/form_options_helper.rb
parentd7b8f0c05945af83bb1ca446e23a26d8f99db2ca (diff)
parent1a935ad7c647534f83ec03388ea1157b39eb6dcb (diff)
downloadrails-89dc4813520c38e4ec62d3ab9b8fda8254987327.tar.gz
rails-89dc4813520c38e4ec62d3ab9b8fda8254987327.tar.bz2
rails-89dc4813520c38e4ec62d3ab9b8fda8254987327.zip
Merge pull request #7026 from rustygeldmacher/select_options_valid_html_master
Fixed bug creating invalid HTML in select options
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_options_helper.rb')
-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 eef426703d..72fbbd109a 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -353,7 +353,7 @@ module ActionView
html_attributes[:disabled] = 'disabled' if disabled && option_value_selected?(value, disabled)
html_attributes[:value] = value
- content_tag(:option, text, html_attributes)
+ content_tag_string(:option, text, html_attributes)
end.join("\n").html_safe
end