diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-02-09 13:21:56 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-02-09 13:21:56 +0000 |
| commit | 308707f1512fc43c570023ee786463d37e43f1fb (patch) | |
| tree | ea7ebdaaf9988a8adfa91b8ff2b496a92a6624f9 /app/controllers/admin_user_controller.rb | |
| parent | b1a683778e817005751ac08654d17366d4cda624 (diff) | |
| parent | 46646f8e659dc3c567495424088eb66e6ef2feee (diff) | |
Merge branch 'release/0.5.1'
Conflicts:
README.md
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 |