diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-18 06:38:28 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-18 06:38:28 +0000 |
| commit | 3a696dd290f4cc6bd560c0b5a8d2a4e33afa178c (patch) | |
| tree | 5ed8edf0d167ecc782791b142da6e6003a98ac9f /activesupport/lib/active_support/core_ext/date_time | |
| parent | 4f375d5b82705db9aeb652d2a562c2df369ca4ac (diff) | |
| download | rails-3a696dd290f4cc6bd560c0b5a8d2a4e33afa178c.tar.gz rails-3a696dd290f4cc6bd560c0b5a8d2a4e33afa178c.tar.bz2 rails-3a696dd290f4cc6bd560c0b5a8d2a4e33afa178c.zip | |
Deprecation: remove deprecated :mday option from Time, Date, and DateTime#change.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7508 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb index e16ad55fbd..4ec75288ca 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -18,7 +18,7 @@ module ActiveSupport #:nodoc: ::DateTime.civil( options[:year] || self.year, options[:month] || self.month, - options[:day] || options[:mday] || self.day, # mday is deprecated + options[:day] || self.day, options[:hour] || self.hour, options[:min] || (options[:hour] ? 0 : self.min), options[:sec] || ((options[:hour] || options[:min]) ? 0 : self.sec), |