aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2011-09-01 11:49:49 -0700
committerJeremy Evans <code@jeremyevans.net>2011-09-01 11:49:49 -0700
commit1ebf84ac2ead038b99e1c982c24f73ffedf07c87 (patch)
tree2a43e8d9dbe45b2f0de614c87e8c7e15d0f0e935 /activesupport/lib/active_support/core_ext
parent90248d2953789f8631480c767ebf3accdbda6a7a (diff)
downloadrails-1ebf84ac2ead038b99e1c982c24f73ffedf07c87.tar.gz
rails-1ebf84ac2ead038b99e1c982c24f73ffedf07c87.tar.bz2
rails-1ebf84ac2ead038b99e1c982c24f73ffedf07c87.zip
Edited activesupport/lib/active_support/core_ext/time/calculations.rb via GitHub
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
-rw-r--r--activesupport/lib/active_support/core_ext/time/calculations.rb2
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 a15a06d0e4..372dd69212 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -9,7 +9,7 @@ class Time
class << self
# Overriding case equality method so that it returns true for ActiveSupport::TimeWithZone instances
def ===(other)
- other.is_a?(::Time)
+ super || (self == Time && other.is_a?(ActiveSupport::TimeWithZone))
end
# Return the number of days in the given month.