diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-03 16:49:15 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-03 16:49:15 -0400 |
| commit | 25cfa69883a5c74b2a6e6a5021c53fd95202c234 (patch) | |
| tree | f4356eab1caa58687997817079d304c32b792ec8 /app/helpers/sessions_helper.rb | |
| parent | 6cc7eb9e419c219d82d318ebb1bab8a853f73da5 (diff) | |
| parent | d6009eddd6f67a9414ff7d707ae82c053e6653ad (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/helpers/sessions_helper.rb')
| -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 |