From 7e130ee89e41f8309283d1b8cbe948ecf3b0ebd2 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 4 Apr 2014 12:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89login=5Fflag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 4 ----
 app/helpers/application_helper.rb     | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index f10e84cc0..769214d65 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -37,15 +37,11 @@ class AccountController < ApplicationController
   end
 
   # Log out current user and redirect to welcome page
-  # cookies[:login_flag] 是为了配合毛xx
-  # 退出再登录的话直接跳转到用户首页而不是登陆前的页面
-  # 相应处理方法在application_helper#is_logout? :1106
   def logout
     if User.current.anonymous?
       redirect_to home_url
     elsif request.post?
       logout_user
-      cookies[:login_flag] = 1
       redirect_to home_url
     end
     # display the logout form
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6047fcf2b..18b884ab4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1103,14 +1103,6 @@ module ApplicationHelper
     url
   end
 
-  # 完成毛 功能
-  # 具体信息参考account_controller#logout
-  def is_logout?
-    ret = cookies[:login_flag] == 1 ? true : false
-    cookies.delete(:login_flag)
-    ret
-  end
-
   def back_url_hidden_field_tag
     url = back_url
     hidden_field_tag('back_url', url, :id => nil) unless url.blank?