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/user_controller.rb | |
| parent | 8e3e395522433d7b83c522871c9233711c95a9b2 (diff) | |
| parent | ac108a6c3ac503dc185a12d502653fca597eeacd (diff) | |
Merge branch 'wdtk' into develop
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! |