aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorpocke <p.ck.t22@gmail.com>2015-01-06 21:56:39 +0900
committerpocke <p.ck.t22@gmail.com>2015-01-06 22:27:54 +0900
commit0599bfa2bc49c885fd4ec3ab7ecce37dc5c03ce5 (patch)
treedd4f1c93102aafea14b602af5437c0600032374c /activesupport/lib
parentde4f40826e3b979735e4f3287725f1a7a3820818 (diff)
downloadrails-0599bfa2bc49c885fd4ec3ab7ecce37dc5c03ce5.tar.gz
rails-0599bfa2bc49c885fd4ec3ab7ecce37dc5c03ce5.tar.bz2
rails-0599bfa2bc49c885fd4ec3ab7ecce37dc5c03ce5.zip
DateTime#<=> return nil when compare to the invalid String as Time.
before: p Time.now == 'a' # => false p Time.now <=> 'a' # => nil require 'active_support' require 'active_support/core_ext' p Time.now == 'a' # => false p Time.now <=> 'a' # => invalid date (ArgumentError) and on ruby 2.2, Time.now == 'a' warning. warning: Comparable#== will no more rescue exceptions of #<=> in the next release. warning: Return nil in #<=> if the comparison is inappropriate or avoid such comparison. after: - Error handling. - Quiet warnings.
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/calculations.rb2
1 files changed, 1 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 55ad384f4f..95617fb8c2 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -168,7 +168,7 @@ class DateTime
if other.kind_of?(Infinity)
super
elsif other.respond_to? :to_datetime
- super other.to_datetime
+ super other.to_datetime rescue nil
else
nil
end