diff options
author | Robin Houston <robin.houston@gmail.com> | 2012-02-06 14:48:12 +0000 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2012-02-06 14:48:12 +0000 |
commit | 3b6e5a692b852a88f55b21a7210f60a6f7cfc24b (patch) | |
tree | 02ec8e10de4f025eb430cd3856fe46381013c08a /app/controllers/admin_user_controller.rb | |
parent | 11782f45795dc8f57e5ca9666e8325976541120e (diff) |
Let admin users use auto-login URLs
Don't change logged-in user from an admin when visiting a auto-login URL.
Closes #306.
Diffstat (limited to 'app/controllers/admin_user_controller.rb')
-rw-r--r-- | app/controllers/admin_user_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index 12b4e553f..b2c084739 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -77,6 +77,7 @@ class AdminUserController < AdminController post_redirect = PostRedirect.new( :uri => main_url(user_url(@admin_user)), :user_id => @admin_user.id) post_redirect.save! url = main_url(confirm_url(:email_token => post_redirect.email_token, :only_path => true)) + session[:user_id] = nil # Log out current (usually admin) user, so we get logged in as the other user redirect_to url end |