summaryrefslogtreecommitdiffstats
path: root/app/controllers/account_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-06-09 18:59:15 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-06-09 18:59:15 +0000
commit19cb6f96f4bf3f10780e292d7b5b59d880b673e8 (patch)
tree0b746347d7e574745165e615a5470b2a510ede45 /app/controllers/account_controller.rb
parent80a7486f95a39ad3fc0946fad17fe51cff01cec6 (diff)
downloadredmine-19cb6f96f4bf3f10780e292d7b5b59d880b673e8.tar.gz
redmine-19cb6f96f4bf3f10780e292d7b5b59d880b673e8.zip
Log the user in after registration if account activation is not needed.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1521 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/account_controller.rb')
-rw-r--r--app/controllers/account_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index b9224c158..3fbbc8912 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -134,8 +134,9 @@ class AccountController < ApplicationController
# Automatic activation
@user.status = User::STATUS_ACTIVE
if @user.save
+ self.logged_user = @user
flash[:notice] = l(:notice_account_activated)
- redirect_to :action => 'login'
+ redirect_to :controller => 'my', :action => 'account'
end
else
# Manual activation by the administrator