From 88ab53730b831fb9a06f43ad19bd1b96ad47d9aa Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 22 Nov 2014 17:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=8A=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=AF=86=E7=A0=81=E9=94=99=E8=AF=AF=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E3=80=8B=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index fe6222359..48254ef90 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -364,7 +364,9 @@ class User < Principal
         end
       end
     end
-    last_login_on = user.last_login_on.nil? ? '' : user.last_login_on.to_s
+    unless user.nil?
+      last_login_on = user.last_login_on.nil? ? '' : user.last_login_on.to_s
+    end
     user.update_column(:last_login_on, Time.now) if user && !user.new_record?
     [user, last_login_on]
   rescue => text