diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-15 18:28:10 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-15 18:28:10 +0000 |
| commit | 31901a5939d5bfad8ae543724de8de3a069ab26a (patch) | |
| tree | 6a19fe75bdc94866d4e6a2ebe884a056b160693e /activesupport/lib/core_ext | |
| parent | 2aac6d90fe41ff5165fc4693baca9d668d79d0d8 (diff) | |
| download | rails-31901a5939d5bfad8ae543724de8de3a069ab26a.tar.gz rails-31901a5939d5bfad8ae543724de8de3a069ab26a.tar.bz2 rails-31901a5939d5bfad8ae543724de8de3a069ab26a.zip | |
Fixed errors thrown to namespace collision
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@421 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/core_ext')
| -rw-r--r-- | activesupport/lib/core_ext/numeric/time.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |