mirror of
https://github.com/github/rails.git
synced 2026-04-04 03:00:58 -04:00
Fixed the option merging in Array#to_xml [#1126 state:resolved]
This commit is contained in:
@@ -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]
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user