From 688d52933a2e611175f3d41c016cf0ba71450b17 Mon Sep 17 00:00:00 2001 From: Dan Kubb Date: Sun, 13 Jan 2013 20:18:35 -0800 Subject: Fix DateTime comparison with DateTime::Infinity object --- activesupport/CHANGELOG.md | 3 +++ activesupport/lib/active_support/core_ext/date_time/calculations.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 18ca36ab06..0511a7ac2d 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -19,6 +19,9 @@ *Daniele Sluijters* +* Fix DateTime comparison with DateTime::Infinity object. + + *Dan Kubb* ## Rails 3.2.11 (Jan 8, 2012) ## 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 b759dcc824..0481bd2195 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -138,6 +138,6 @@ class DateTime # Layers additional behavior on DateTime#<=> so that Time and ActiveSupport::TimeWithZone instances can be compared with a DateTime def <=>(other) - super other.to_datetime + super other.kind_of?(Infinity) ? other : other.to_datetime end end -- cgit v1.2.3