From 31901a5939d5bfad8ae543724de8de3a069ab26a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 15 Jan 2005 18:28:10 +0000 Subject: Fixed errors thrown to namespace collision git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@421 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/core_ext/numeric/time.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/core_ext') diff --git a/activesupport/lib/core_ext/numeric/time.rb b/activesupport/lib/core_ext/numeric/time.rb index 850dc9a783..ac5ecb8b70 100644 --- a/activesupport/lib/core_ext/numeric/time.rb +++ b/activesupport/lib/core_ext/numeric/time.rb @@ -38,7 +38,7 @@ module ActiveSupport alias :year :years # Reads best without arguments: 10.minutes.ago - def ago(time = Time.now) + def ago(time = ::Time.now) time - self end @@ -46,7 +46,7 @@ module ActiveSupport alias :until :ago # Reads best with argument: 10.minutes.since(time) - def since(time = Time.now) + def since(time = ::Time.now) time + self end -- cgit v1.2.3