diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-03-20 15:12:56 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-03-20 15:13:26 +0000 |
| commit | 54ff57fe0f8e6004ae23eabc37ff2047f133fd38 (patch) | |
| tree | 4fbef12d49e69d55442ff8f557efd07881294bf0 /app/controllers/admin_user_controller.rb | |
| parent | 8e3e395522433d7b83c522871c9233711c95a9b2 (diff) | |
| parent | ac108a6c3ac503dc185a12d502653fca597eeacd (diff) | |
Merge branch 'wdtk' into develop
Diffstat (limited to 'app/controllers/admin_user_controller.rb')
| -rw-r--r-- | app/controllers/admin_user_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index b2c084739..249030537 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -74,10 +74,9 @@ class AdminUserController < AdminController def login_as @admin_user = User.find(params[:id]) # check user does exist - post_redirect = PostRedirect.new( :uri => main_url(user_url(@admin_user)), :user_id => @admin_user.id) + post_redirect = PostRedirect.new( :uri => main_url(user_url(@admin_user)), :user_id => @admin_user.id, :circumstance => "login_as" ) 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 |