diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 20:09:54 -0400 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 20:09:54 -0400 |
| commit | f3c395c56a644d976aa9a5608300557600bc683e (patch) | |
| tree | 83cb961a721fa8c50903c70bb08ae14dd15ca58c /app/helpers | |
| parent | 7575d8cc70a28b323db0486ed06ab8af33b1f21a (diff) | |
| parent | f85943114dba527a1f87abb03229553472f57c0c (diff) | |
solved merge conflicts
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 ac62cdc..499e988 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -20,7 +20,7 @@ module SessionsHelper def current_user @token ||= Session.hash_token(cookies[:remember_token]) @session ||= Session.find_by(token: @token) - @current_user ||= (@session.nil? ? NilUser.new : @session.user) + @current_user ||= (@session.nil? ? User::NilUser.new : @session.user) end # checks if someone is currently signed in @@ -32,7 +32,7 @@ module SessionsHelper if signed_in? @session.destroy end - @current_user = NilUser.new + @current_user = User::NilUser.new cookies.delete(:remember_token) end |