Fixed the option merging in Array#to_xml [#1126 state:resolved]

rails · Oct 31, 2008 · e466ae1 · e466ae1
1 parent 7857e42
commit e466ae1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *2.2.1 [RC2 or 2.2 final]*
 
+* Fixed the option merging in Array#to_xml #1126 [Rudolf Gavlas]
+
 * Make I18n::Backend::Simple reload its translations in development mode [DHH/Sven Fuchs]
 
 

diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -172,7 +172,7 @@ def to_xml(options = {})
           else
             xml.tag!(root, options[:skip_types] ? {} : {:type => "array"}) {
               yield xml if block_given?
-              each { |e| e.to_xml(opts.merge!({ :skip_instruct => true })) }
+              each { |e| e.to_xml(opts.merge({ :skip_instruct => true })) }
             }
           end
         end