diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-13 21:47:45 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-13 21:47:45 +0000 |
| commit | 389616e68d2b4f1f48014cf9d6d45754936c7bed (patch) | |
| tree | 133ccacfefa426c1ce460267122dbda96fd705f9 /activesupport/lib | |
| parent | c7dd2a1c11c4cf66eac1b6c00ded956b1c3d55f6 (diff) | |
| download | rails-389616e68d2b4f1f48014cf9d6d45754936c7bed.tar.gz rails-389616e68d2b4f1f48014cf9d6d45754936c7bed.tar.bz2 rails-389616e68d2b4f1f48014cf9d6d45754936c7bed.zip | |
Fix Time#years_ago and #years_since from leap days. Closes #9865.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7867 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 94d660afbd..d594cf21f9 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -110,12 +110,12 @@ module ActiveSupport #:nodoc: # Returns a new Time representing the time a number of specified years ago def years_ago(years) - change(:year => self.year - years) + advance(:years => -years) end # Returns a new Time representing the time a number of specified years in the future def years_since(years) - change(:year => self.year + years) + advance(:years => years) end # Short-hand for years_ago(1) |