aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorClaudio B <claudiob@users.noreply.github.com>2015-12-10 12:30:49 -0800
committerClaudio B <claudiob@users.noreply.github.com>2015-12-10 12:30:49 -0800
commit39309d1347b53b31a6a2d9c7ac59c54df46358a9 (patch)
tree2f7dd01147e6aac87ba144fcd50e0a841edb9008 /activesupport
parent2747e84be2f4a606e3178bbcc8ac95765deb0405 (diff)
parent7564da46f23bb0075390e44b5fbedcdc8a0c4dc5 (diff)
downloadrails-39309d1347b53b31a6a2d9c7ac59c54df46358a9.tar.gz
rails-39309d1347b53b31a6a2d9c7ac59c54df46358a9.tar.bz2
rails-39309d1347b53b31a6a2d9c7ac59c54df46358a9.zip
Merge pull request #22553 from jtwarren/patch-1
Correct the time comparison for remember_me token
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/message_verifier.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index 64c5232cf4..854029bf83 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -15,7 +15,7 @@ module ActiveSupport
# In the authentication filter:
#
# id, time = @verifier.verify(cookies[:remember_me])
- # if time < Time.now
+ # if Time.now < time
# self.current_user = User.find(id)
# end
#