aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikachu.com>2010-09-10 22:43:02 +0700
committerSantiago Pastorino <santiago@wyeworks.com>2010-09-19 11:26:20 -0700
commitaf6757a1ca7027b526b35d74c94a520d6bb24d7a (patch)
tree162d9567c963f26800416b2396c8bdc9842132b8 /activesupport/lib
parente3d38e7da24197057f19529580f9f94424cd4848 (diff)
downloadrails-af6757a1ca7027b526b35d74c94a520d6bb24d7a.tar.gz
rails-af6757a1ca7027b526b35d74c94a520d6bb24d7a.tar.bz2
rails-af6757a1ca7027b526b35d74c94a520d6bb24d7a.zip
Use `Time.current` to maintain consistency with AS::Duration
In [32b82e4c6f5523cdf5ee78c3022c50b46e018351], the committer has switch methods in AS::Duration to use `Time.current` to return the correct duration based on the `Time.default_zone` instead of using `Time.now`. [#5607 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/numeric/time.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/numeric/time.rb b/activesupport/lib/active_support/core_ext/numeric/time.rb
index d32a9e0531..e73915ffcf 100644
--- a/activesupport/lib/active_support/core_ext/numeric/time.rb
+++ b/activesupport/lib/active_support/core_ext/numeric/time.rb
@@ -60,7 +60,7 @@ class Numeric
alias :fortnight :fortnights
# Reads best without arguments: 10.minutes.ago
- def ago(time = ::Time.now)
+ def ago(time = ::Time.current)
time - self
end
@@ -68,7 +68,7 @@ class Numeric
alias :until :ago
# Reads best with argument: 10.minutes.since(time)
- def since(time = ::Time.now)
+ def since(time = ::Time.current)
time + self
end