aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/time_with_zone.rb
diff options
context:
space:
mode:
authorMarc-Andre Lafortune <github@marc-andre.ca>2011-11-22 15:37:16 -0500
committerMarc-Andre Lafortune <github@marc-andre.ca>2011-11-22 15:37:16 -0500
commita4912078c7d345a347f023ef28c0986458bdebf5 (patch)
treea2a0a553fc815b2f6888f54b89ebd66ec82ab847 /activesupport/lib/active_support/time_with_zone.rb
parentcb06727b6cb7310808f5b9ce1bf254055806ba80 (diff)
downloadrails-a4912078c7d345a347f023ef28c0986458bdebf5.tar.gz
rails-a4912078c7d345a347f023ef28c0986458bdebf5.tar.bz2
rails-a4912078c7d345a347f023ef28c0986458bdebf5.zip
Fix inconsistencies with Time{WithZone}#{hash,eql?}
Diffstat (limited to 'activesupport/lib/active_support/time_with_zone.rb')
-rw-r--r--activesupport/lib/active_support/time_with_zone.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 63279d0e6d..d3adf671a0 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -203,7 +203,11 @@ module ActiveSupport
end
def eql?(other)
- utc == other
+ utc.eql?(other)
+ end
+
+ def hash
+ utc.hash
end
def +(other)
@@ -277,7 +281,6 @@ module ActiveSupport
def to_i
utc.to_i
end
- alias_method :hash, :to_i
alias_method :tv_sec, :to_i
# A TimeWithZone acts like a Time, so just return +self+.