Fix Builder::XmlMarkup lazy load in Array#to_xml

eugeneius · eugeneius · commit f2f7bcc047fa · 2020-04-13T23:05:25.000+01:00
Followup to e7514dc.
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -181,7 +181,7 @@ def to_formatted_s(format = :default)
   #   </messages>
   #
   def to_xml(options = {})
-    require "active_support/builder" unless defined?(Builder)
+    require "active_support/builder" unless defined?(Builder::XmlMarkup)
 
     options = options.dup
     options[:indent]  ||= 2
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -73,7 +73,7 @@ class Hash
   # configure your own builder with the <tt>:builder</tt> option. The method also accepts
   # options like <tt>:dasherize</tt> and friends, they are forwarded to the builder.
   def to_xml(options = {})
-    require "active_support/builder" unless defined?(Builder) && defined?(Builder::XmlMarkup)
+    require "active_support/builder" unless defined?(Builder::XmlMarkup)
 
     options = options.dup
     options[:indent]  ||= 2

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ def to_formatted_s(format = :default)`
`181`	`181`	`# </messages>`
`182`	`182`	`#`
`183`	`183`	`def to_xml(options = {})`
`184`		`- require "active_support/builder" unless defined?(Builder)`
	`184`	`+ require "active_support/builder" unless defined?(Builder::XmlMarkup)`
`185`	`185`
`186`	`186`	`options = options.dup`
`187`	`187`	`options[:indent] \|\|= 2`