diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-05 07:08:39 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-05 07:08:39 -0700 |
| commit | a23e3855c5a8a2b0747c856c195ab7adc17f601e (patch) | |
| tree | 132a3b0f7bd7305ae8627f96b6fd175722c66030 /actionpack/lib/action_view | |
| parent | f4a690dae7eec4ab8c129a0318fadc179e055d80 (diff) | |
| parent | ffe56f3b8c579b5f5dbf47ae1e5bb052a64d9783 (diff) | |
| download | rails-a23e3855c5a8a2b0747c856c195ab7adc17f601e.tar.gz rails-a23e3855c5a8a2b0747c856c195ab7adc17f601e.tar.bz2 rails-a23e3855c5a8a2b0747c856c195ab7adc17f601e.zip | |
Merge pull request #2872 from sikachu/content_tag_html_safe
Make sure that result from content_tag_for with collection is html_safe
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/record_tag_helper.rb | 2 |
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 |