diff options
| author | Azul <azul@leap.se> | 2012-11-12 19:16:55 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-12 19:16:55 +0100 |
| commit | c886cc17b6f37ddd556e70fe2d76a3ea28db52bf (patch) | |
| tree | e27fe040bfaba5840730f466d4c6f90213759d5e /users/app/controllers/controller_extension | |
| parent | ca2e1b9f379ccba068ad0ebb852d855f1639cd3a (diff) | |
| parent | 5b300b554682c232c0955bdb0dd3d8263dde901e (diff) | |
Merge branch 'feature-warden-srp' into develop
Diffstat (limited to 'users/app/controllers/controller_extension')
| -rw-r--r-- | users/app/controllers/controller_extension/authentication.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb index c3342f3..87f7921 100644 --- a/users/app/controllers/controller_extension/authentication.rb +++ b/users/app/controllers/controller_extension/authentication.rb @@ -7,8 +7,8 @@ module ControllerExtension::Authentication helper_method :current_user, :logged_in?, :admin? end - def current_user - @current_user ||= User.find(session[:user_id]) if session[:user_id] + def authentication_error + warden.winning_strategy.try(:message) end def logged_in? |