diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 22:55:46 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 22:55:46 -0500 |
| commit | b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2 (patch) | |
| tree | 05ae73741366a390fd543b67f7080325c8d7525e /activesupport/lib/active_support/core_ext/array | |
| parent | 6f9e449830902319d3c0897e67d8ac9c89bff39d (diff) | |
| download | rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.gz rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.bz2 rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.zip | |
Rollback AS bundler work and improve activation of vendored dependencies
Diffstat (limited to 'activesupport/lib/active_support/core_ext/array')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index c53cf3f530..0743ab181e 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -157,7 +157,7 @@ class Array # def to_xml(options = {}) raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml } - require 'builder' unless defined?(Builder) + require 'active_support/vendor/builder' unless defined?(Builder) options = options.dup options[:root] ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(first.class.name)) : "records" |