Do not reset session when a non logged in user request the login form (#4958).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3572 e93f8b46-1217-0410-a6f0-8f06a7374b81

Do not reset session when a non logged in user request the login form (#4958).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3572 e93f8b46-1217-0410-a6f0-8f06a7374b81
e109c9b6 · Jean-Philippe Lang · 7e4aa9ca · e109c9b6
Commit e109c9b6 authored Mar 12, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

account_controller.rb app/controllers/account_controller.rb +5 -3

No files found.
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -128,9 +128,11 @@ class AccountController < ApplicationController
  private
  def logout_user
-    cookies.delete :autologin
+    if User.current.logged?
-    Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged?
+      cookies.delete :autologin
-    self.logged_user = nil
+      Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
+      self.logged_user = nil
+    end
  end
  def authenticate_user