aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_options_helper.rb
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2010-06-17 09:17:31 +0200
committerXavier Noria <fxn@hashref.com>2010-06-19 17:22:49 +0200
commit728b9eccad99d22028577e8b06433e8344b15d01 (patch)
treed4690e7d28c69c90c49130bb37e648e7d8253bc6 /actionpack/lib/action_view/helpers/form_options_helper.rb
parentf368b21cb6e45268359c0f0b8beda175e3b40eae (diff)
downloadrails-728b9eccad99d22028577e8b06433e8344b15d01.tar.gz
rails-728b9eccad99d22028577e8b06433e8344b15d01.tar.bz2
rails-728b9eccad99d22028577e8b06433e8344b15d01.zip
option_groups_from_collection_for_select should return HTML-safe string [#4879 state:resolved]
Signed-off-by: Xavier Noria <fxn@hashref.com>
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 fe71d2cdf7..e48580e0ad 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -398,7 +398,7 @@ module ActionView
options_for_select += "<optgroup label=\"#{html_escape(group_label_string)}\">"
options_for_select += options_from_collection_for_select(eval("group.#{group_method}"), option_key_method, option_value_method, selected_key)
options_for_select += '</optgroup>'
- end
+ end.html_safe
end
# Returns a string of <tt><option></tt> tags, like <tt>options_for_select</tt>, but