diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-04-03 17:56:24 -0400 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-04-03 17:56:24 -0400 |
| commit | 8b3fae332f81b42671bd2a4f332626c75fdeb976 (patch) | |
| tree | 917b5d74695b69670a75f83f0ba3deeb83e44f07 /app/helpers/sessions_helper.rb | |
| parent | 6289593da4b6ad30c893b61caf4ac142b590710a (diff) | |
| parent | 0c1583c0b31504dfdbbbec3e6dcc240acb059891 (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 |