aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/date_time.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-03-26 19:03:37 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-03-26 19:03:37 -0700
commit7985298948534bf13e01e054f8ff4c5248780dca (patch)
treec43e7dd8835a9d5008a6d2f69ee5ba88ab6fc501 /activesupport/lib/active_support/core_ext/date_time.rb
parent34929fed2254570941309a731a386de573e64b5a (diff)
downloadrails-7985298948534bf13e01e054f8ff4c5248780dca.tar.gz
rails-7985298948534bf13e01e054f8ff4c5248780dca.tar.bz2
rails-7985298948534bf13e01e054f8ff4c5248780dca.zip
Convert DateTime extension modules to class reopens
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time.rb b/activesupport/lib/active_support/core_ext/date_time.rb
index fd979a267e..eab6d0c515 100644
--- a/activesupport/lib/active_support/core_ext/date_time.rb
+++ b/activesupport/lib/active_support/core_ext/date_time.rb
@@ -1,11 +1,12 @@
-require 'active_support/core_ext/util'
require 'date'
-require 'active_support/core_ext/time/behavior'
-require 'active_support/core_ext/time/zones'
+require 'active_support/core_ext/date_time/calculations'
+require 'active_support/core_ext/date_time/zones'
+
+require 'active_support/core_ext/time/behavior'
class DateTime
include ActiveSupport::CoreExtensions::Time::Behavior
- include ActiveSupport::CoreExtensions::Time::Zones
end
-ActiveSupport.core_ext DateTime, %w(calculations conversions)
+require 'active_support/core_ext/util'
+ActiveSupport.core_ext DateTime, %w(conversions)