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 /actionpack | |
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 'actionpack')
-rw-r--r-- | actionpack/lib/action_view/template/handlers/builder.rb | 2 | ||||
-rw-r--r-- | actionpack/test/template/form_options_helper_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb index ba0d17b5af..5f381f7bf0 100644 --- a/actionpack/lib/action_view/template/handlers/builder.rb +++ b/actionpack/lib/action_view/template/handlers/builder.rb @@ -6,7 +6,7 @@ module ActionView self.default_format = Mime::XML def compile(template) - require 'active_support/vendor/builder' + require 'builder' "xml = ::Builder::XmlMarkup.new(:indent => 2);" + "self.output_buffer = xml.target!;" + template.source + diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb index f3cdab05bf..aa40e46aa8 100644 --- a/actionpack/test/template/form_options_helper_test.rb +++ b/actionpack/test/template/form_options_helper_test.rb @@ -1,5 +1,5 @@ require 'abstract_unit' -require 'active_support/vendor/tzinfo' +require 'tzinfo' TZInfo::Timezone.cattr_reader :loaded_zones |