diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-25 19:37:41 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-25 19:37:41 -0300 |
| commit | 51910106f196e4461b35661f90a835dec0c21ccf (patch) | |
| tree | 2233f4f95e6de1cf071f69ffd55c75ed9fae69e8 /activesupport | |
| parent | 689b89f548077264e46153222455d931a0d7ddf6 (diff) | |
| parent | c3a0a36fc3c5e54ad44643b8c0470ccbd47d9a64 (diff) | |
| download | rails-51910106f196e4461b35661f90a835dec0c21ccf.tar.gz rails-51910106f196e4461b35661f90a835dec0c21ccf.tar.bz2 rails-51910106f196e4461b35661f90a835dec0c21ccf.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 3 |
1 files changed, 2 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 4f3b869f50..4f4492f0fd 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -172,7 +172,8 @@ class Time # Returns a new Time representing the start of the day (0:00) def beginning_of_day - (self - seconds_since_midnight).change(:usec => 0) + #(self - seconds_since_midnight).change(:usec => 0) + change(:hour => 0, :min => 0, :sec => 0, :usec => 0) end alias :midnight :beginning_of_day alias :at_midnight :beginning_of_day |