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/user_controller.rb | |
| parent | b1a683778e817005751ac08654d17366d4cda624 (diff) | |
| parent | 46646f8e659dc3c567495424088eb66e6ef2feee (diff) | |
Merge branch 'release/0.5.1'
Conflicts:
README.md
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index f49fc9165..403cb9684 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -182,9 +182,11 @@ class UserController < ApplicationController return end - @user = post_redirect.user - @user.email_confirmed = true - @user.save! + if !User.stay_logged_in_on_redirect?(@user) + @user = post_redirect.user + @user.email_confirmed = true + @user.save! + end session[:user_id] = @user.id session[:user_circumstance] = post_redirect.circumstance |