diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-09 14:12:05 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-09 14:12:05 -0800 |
| commit | b0acc77edced44e47c8570bf7dddd4ce19f06cb0 (patch) | |
| tree | 8561efa4bd47bbe5f72cd9c30e978bb767d86870 /activesupport/lib/active_support/core_ext/date_time | |
| parent | a67f25d50b5dd9585bb10ecd19bee6a34d69de6a (diff) | |
| download | rails-b0acc77edced44e47c8570bf7dddd4ce19f06cb0.tar.gz rails-b0acc77edced44e47c8570bf7dddd4ce19f06cb0.tar.bz2 rails-b0acc77edced44e47c8570bf7dddd4ce19f06cb0.zip | |
Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/calculations.rb | 6 |
1 files changed, 5 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 8e5d723074..73ad0aa097 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -151,7 +151,11 @@ 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 + if other.respond_to? :to_datetime + super other.to_datetime + else + nil + end end end |