Merge branch 'guange_dev' into szzh

2015-05-28 10:31:06 +08:00 · 2015-05-28 10:31:06 +08:00 · a58a548095
parent 356dd21c52 5279c2d3e5
commit a58a548095
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -199,7 +199,7 @@ class ApplicationController < ActionController::Base
  # Logs out current user
  def logout_user
    if User.current.logged?
-      cookies.delete(autologin_cookie_name, domain: Redmine::Configuration['cookie_domain'])
+      cookies.delete(autologin_cookie_name, domain: :all)
      # Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
      self.logged_user = nil
    end