From 91b245ad2cb694726996c31811276b5129a0be7e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sat, 12 Dec 2015 18:06:59 +0800
Subject: [PATCH] =?UTF-8?q?lastname=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=B9=9F?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=8A=A0,=E5=8F=AF=E4=BB=A5=E7=9C=81?=
 =?UTF-8?q?=E6=8E=89=E6=9F=A5=E8=AF=A2extensions=E7=9A=84=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 65c0bf858..0d3d465e2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -399,16 +399,7 @@ class User < Principal
   end
   
   def show_name
-    name = ""
-    unless self.user_extensions.nil?
-      if self.user_extensions.identity == 2
-        name = firstname
-      else
-        name = lastname+firstname
-      end
-    else
-      name = lastname+firstname
-    end
+    name = lastname + firstname
     name.empty? || name.nil? ? login : name
   end
   ## end