diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-04-19 11:09:41 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-04-19 11:09:41 +0100 |
| commit | 69be0151757f1802052b9895135d3047605e6338 (patch) | |
| tree | aaeab66bb26e21bbd582b243233db60f1a855f5d /app/controllers/user_controller.rb | |
| parent | 17d8dad044dea0fc678d0bdc409700131685db86 (diff) | |
| parent | a33c560ab2a3a6c1090dc0334b85c46b9f45c107 (diff) | |
Merge branch 'develop' into purge-requests
Conflicts:
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 403cb9684..08726183e 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -182,7 +182,7 @@ class UserController < ApplicationController return end - if !User.stay_logged_in_on_redirect?(@user) + if !User.stay_logged_in_on_redirect?(@user) || post_redirect.circumstance == "login_as" @user = post_redirect.user @user.email_confirmed = true @user.save! |