aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikachu.com>2011-09-05 20:04:37 +0700
committerPrem Sichanugrist <s@sikachu.com>2011-09-05 20:04:37 +0700
commitffe56f3b8c579b5f5dbf47ae1e5bb052a64d9783 (patch)
treee247c520e80f9ab8ce80d7ae213c857be9efe52a /actionpack/lib/action_view
parent499ad11700dbfdfe6382f72fb8f46cad62ac7c9b (diff)
downloadrails-ffe56f3b8c579b5f5dbf47ae1e5bb052a64d9783.tar.gz
rails-ffe56f3b8c579b5f5dbf47ae1e5bb052a64d9783.tar.bz2
rails-ffe56f3b8c579b5f5dbf47ae1e5bb052a64d9783.zip
Make sure that result from content_tag_for with collection is html_safe
Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe.
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/record_tag_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index ad8896a2fd..cbee517adc 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -84,7 +84,7 @@ module ActionView
if single_or_multiple_records.respond_to?(:to_ary)
single_or_multiple_records.to_ary.map do |single_record|
capture { content_tag_for_single_record(tag_name, single_record, prefix, options, &block) }
- end.join("\n")
+ end.join("\n").html_safe
else
content_tag_for_single_record(tag_name, single_or_multiple_records, prefix, options, &block)
end