aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/core_ext/array/conversions.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 24a7f1639e..6362d869b7 100644
--- 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
index 11c128da22..cf3e03f62c 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -172,7 +172,7 @@ module ActiveSupport #:nodoc:
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