diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-24 18:36:40 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-24 18:38:18 -0700 |
commit | 0bd6e933c01868db7c7e20d46c972c4e7395b743 (patch) | |
tree | d91dbf5aaf990748082e42eb772ba049844794a3 /activesupport/lib/active_support/core_ext/hash | |
parent | 772a32a22d71f7a22108719d88c94959ae4942b6 (diff) | |
download | rails-0bd6e933c01868db7c7e20d46c972c4e7395b743.tar.gz rails-0bd6e933c01868db7c7e20d46c972c4e7395b743.tar.bz2 rails-0bd6e933c01868db7c7e20d46c972c4e7395b743.zip |
Restore split between require-time and runtime load path mungery. Simplifies vendor requires.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash')
-rw-r--r-- | activesupport/lib/active_support/core_ext/hash/conversions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index 1f8bd7cd82..bd9419e1a2 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -84,7 +84,7 @@ class Hash alias_method :to_param, :to_query def to_xml(options = {}) - require 'active_support/vendor/builder' unless defined?(Builder) + require 'builder' unless defined?(Builder) options = options.dup options[:indent] ||= 2 |