diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-04-27 15:39:52 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-04-27 15:39:52 -0700 |
| commit | 434be0fd69a58cc744cd48c0d69440df1102b157 (patch) | |
| tree | 97c406055e4a4aa9d60948a728ff0dcd0217c5aa /actionpack/lib | |
| parent | 05bee990b4bd0ce3b02e75399c857e168f41edb6 (diff) | |
| parent | 7006e975ac29e48cb9645733df04b9841bb2c29d (diff) | |
| download | rails-434be0fd69a58cc744cd48c0d69440df1102b157.tar.gz rails-434be0fd69a58cc744cd48c0d69440df1102b157.tar.bz2 rails-434be0fd69a58cc744cd48c0d69440df1102b157.zip | |
Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport
Do not mutate options hash
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/record_tag_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb index b351302d01..aae6389445 100644 --- a/actionpack/lib/action_view/helpers/record_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb @@ -96,8 +96,8 @@ module ActionView # for each record. def content_tag_for_single_record(tag_name, record, prefix, options, &block) options, prefix = prefix, nil if prefix.is_a?(Hash) - options ||= {} - options.merge!({ :class => "#{dom_class(record, prefix)} #{options[:class]}".strip, :id => dom_id(record, prefix) }) + options = options ? options.dup : {} + options.merge!(:class => "#{dom_class(record, prefix)} #{options[:class]}".strip, :id => dom_id(record, prefix)) if block.arity == 0 content_tag(tag_name, capture(&block), options) else |