From 201f373e7a183f33264ae31e7ca66768dddd3ebe Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 3 Jul 2010 01:39:54 -0300
Subject: Refactor move some date, time and date_time methods to */zones and
 fixed some requires

---
 activesupport/lib/active_support/core_ext/time/calculations.rb | 5 +++++
 activesupport/lib/active_support/core_ext/time/zones.rb        | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'activesupport/lib/active_support/core_ext/time')

diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 3c218d88e5..90b6cd3685 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -40,6 +40,11 @@ class Time
     def local_time(*args)
       time_with_datetime_fallback(:local, *args)
     end
+
+    # Returns <tt>Time.zone.now</tt> when <tt>config.time_zone</tt> is set, otherwise just returns <tt>Time.now</tt>.
+    def current
+      ::Time.zone_default ? ::Time.zone.now : ::Time.now
+    end
   end
 
   # Tells whether the Time object's time lies in the past
diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb
index a02402aa3f..6b9ee84d5c 100644
--- a/activesupport/lib/active_support/core_ext/time/zones.rb
+++ b/activesupport/lib/active_support/core_ext/time/zones.rb
@@ -41,11 +41,6 @@ class Time
       ::Time.zone = old_zone
     end
 
-    # Returns <tt>Time.zone.now</tt> when <tt>config.time_zone</tt> is set, otherwise just returns <tt>Time.now</tt>.
-    def current
-      ::Time.zone_default ? ::Time.zone.now : ::Time.now
-    end
-
     private
       def get_zone(time_zone)
         return time_zone if time_zone.nil? || time_zone.is_a?(ActiveSupport::TimeZone)
-- 
cgit v1.2.3