diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-05-31 16:37:09 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-05-31 16:37:09 +0000 |
| commit | ff5c7c8c40ba24431ec5c9cdad23ddb9963d2c67 (patch) | |
| tree | d290a2887c2e388894feb33f39ddfc4bf7459312 /activesupport/lib/active_support/core_ext/time | |
| parent | 1edd21bb0288526fc3a79ac1f960f4d5e6e6a2f5 (diff) | |
| download | rails-ff5c7c8c40ba24431ec5c9cdad23ddb9963d2c67.tar.gz rails-ff5c7c8c40ba24431ec5c9cdad23ddb9963d2c67.tar.bz2 rails-ff5c7c8c40ba24431ec5c9cdad23ddb9963d2c67.zip | |
Added Date#change (like Time#change) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6910 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/core_ext/time')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 1fdfbcdf45..8f9c2ffa70 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -61,7 +61,7 @@ module ActiveSupport #:nodoc: self.utc? ? :utc_time : :local_time, options[:year] || self.year, options[:month] || self.month, - options[:mday] || self.mday, + options[:day] || options[:mday] || self.day, # mday is deprecated options[:hour] || self.hour, options[:min] || (options[:hour] ? 0 : self.min), options[:sec] || ((options[:hour] || options[:min]) ? 0 : self.sec), |