diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-10 13:17:20 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-10 13:17:20 -0700 |
| commit | 89dc4813520c38e4ec62d3ab9b8fda8254987327 (patch) | |
| tree | 625f75aa0704a40f9205963b85f4cde64f347577 /actionpack/lib | |
| parent | d7b8f0c05945af83bb1ca446e23a26d8f99db2ca (diff) | |
| parent | 1a935ad7c647534f83ec03388ea1157b39eb6dcb (diff) | |
| download | rails-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')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/tags/base.rb | 4 |
2 files changed, 3 insertions, 3 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 diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb index e077cd5b3c..192f5eebaa 100644 --- a/actionpack/lib/action_view/helpers/tags/base.rb +++ b/actionpack/lib/action_view/helpers/tags/base.rb @@ -137,10 +137,10 @@ module ActionView def add_options(option_tags, options, value = nil) if options[:include_blank] - option_tags = content_tag('option', options[:include_blank].kind_of?(String) ? options[:include_blank] : nil, :value => '') + "\n" + option_tags + option_tags = content_tag_string('option', options[:include_blank].kind_of?(String) ? options[:include_blank] : nil, :value => '') + "\n" + option_tags end if value.blank? && options[:prompt] - option_tags = content_tag('option', prompt_text(options[:prompt]), :value => '') + "\n" + option_tags + option_tags = content_tag_string('option', prompt_text(options[:prompt]), :value => '') + "\n" + option_tags end option_tags end |