Merged r3537 and r3572 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3644 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 11 insertions, 6 deletions

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index b1500d428..df5186c86 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -25,8 +25,7 @@ class AccountController < ApplicationController
   # Login request and validation
   def login
     if request.get?
-      # Logout user
-      self.logged_user = nil
+      logout_user
     else
       # Authenticate user
       if Setting.openid? && using_open_id?
@@ -39,9 +38,7 @@ class AccountController < ApplicationController
 
   # Log out current user and redirect to welcome page
   def logout
-    cookies.delete :autologin
-    Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged?
-    self.logged_user = nil
+    logout_user
     redirect_to home_url
   end
   
@@ -134,7 +131,15 @@ class AccountController < ApplicationController
   end
   
   private
-
+  
+  def logout_user
+    if User.current.logged?
+      cookies.delete :autologin
+      Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
+      self.logged_user = nil
+    end
+  end
+  
   def password_authentication
     user = User.try_to_login(params[:username], params[:password])