aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-07-31 09:16:21 +0000
committerJamis Buck <jamis@37signals.com>2005-07-31 09:16:21 +0000
commitb4c34f7b2b18720381b3c8cfa79f66a530b3ed0b (patch)
tree51a580e8abe48f6a9f0022d0004e8494245a7fe5 /activesupport/lib
parenteda17194700d4cdc0d863ae8c49a8e3dbbf1615c (diff)
downloadrails-b4c34f7b2b18720381b3c8cfa79f66a530b3ed0b.tar.gz
rails-b4c34f7b2b18720381b3c8cfa79f66a530b3ed0b.tar.bz2
rails-b4c34f7b2b18720381b3c8cfa79f66a530b3ed0b.zip
Fixed that Time#midnight would have a non-zero usec on some platforms #1836
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/time/calculations.rb4
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 8247003ca3..503717f4fe 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -101,7 +101,7 @@ module ActiveSupport #:nodoc:
# Returns a new Time representing the start of the day (0:00)
def beginning_of_day
- self - self.seconds_since_midnight
+ (self - self.seconds_since_midnight).change(:usec => 0)
end
alias :midnight :beginning_of_day
alias :at_midnight :beginning_of_day
@@ -132,4 +132,4 @@ module ActiveSupport #:nodoc:
end
end
end
-end \ No newline at end of file
+end