From e80149c6c8b477eed3beb61f8f14b5d0bc68ab84 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sun, 10 Jan 2016 15:38:45 +0800
Subject: [PATCH] =?UTF-8?q?@7008=E6=89=BE=E4=B8=8D=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index aa048888c..f3367db59 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -409,7 +409,7 @@ class User < Principal
 
   def get_at_show_name
     name = show_name
-    name = "#{name} #{self.login}" if name != self.login
+    (name != self.login) ? "#{name} #{self.login}" : name
   end
   
   #added by nie