aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/array
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-12-03 16:47:53 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-12-03 16:47:53 +0000
commit0297b31b8235ee5c64743fdd4f922b008dd83af0 (patch)
tree224bfd38a876a7b3aa7ce47a4efc6c83e7ae5e9d /activesupport/lib/active_support/core_ext/array
parent7611fa6d469cef9accabe6bb5e7e95914756322a (diff)
downloadrails-0297b31b8235ee5c64743fdd4f922b008dd83af0.tar.gz
rails-0297b31b8235ee5c64743fdd4f922b008dd83af0.tar.bz2
rails-0297b31b8235ee5c64743fdd4f922b008dd83af0.zip
Fixed Array#to_xml when it contains a series of hashes (each piece would get its own XML declaration) (closes #6610) [thkarcher/cyu]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/core_ext/array')
-rw-r--r--activesupport/lib/active_support/core_ext/array/conversions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 1a5ddee9c6..51ac83294c 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -61,9 +61,9 @@ module ActiveSupport #:nodoc:
options[:builder].instruct! unless options.delete(:skip_instruct)
- opts = options.merge({ :skip_instruct => true, :root => children })
+ opts = options.merge({ :root => children })
- options[:builder].tag!(root) { each { |e| e.to_xml(opts) } }
+ options[:builder].tag!(root) { each { |e| e.to_xml(opts.merge!({ :skip_instruct => true })) } }
end
end