diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-03 16:49:07 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-03 16:49:07 -0400 |
| commit | ef0cc1035632d7b59a5977038ac30fe1292d0128 (patch) | |
| tree | cc4b6f1105defaa7ac56afa141d2416a7f956f9d /app/helpers | |
| parent | 9d2e1394bc09d4df3fce97d6151f5bfc3546fbe8 (diff) | |
| parent | d6009eddd6f67a9414ff7d707ae82c053e6653ad (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/sessions_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 54e4b0d..89e5ef3 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -18,7 +18,7 @@ module SessionsHelper def current_user @token ||= Session.hash_token(cookies[:remember_token]) @session ||= Session.find_by(token: @token) - @current_user ||= (@session.nil? ? nil : @session.user) + @current_user ||= (@session.nil? ? NilUser.new : @session.user) end # checks if someone is currently signed in @@ -30,7 +30,7 @@ module SessionsHelper if signed_in? @session.destroy end - @current_user = nil + @current_user = NilUser.new cookies.delete(:remember_token) end |