From f466084a17ab9d14956bd2bf2f31f45d22f636ec Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 5 Jun 2015 11:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=B2=A1=E6=9C=89=E5=B0=B1?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 269017eb8..0ebdea211 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -218,7 +218,7 @@
                                                     </td>
                                                   </tr>
                                                  <% end %>
-                                              <% unless @user.user_extensions.nil?&&@user.user_extensions.location.empty?%>
+                                              <% if @user.user_extensions && @user.user_extensions.location && !@user.user_extensions.location.empty?%>
                                                 <tr>
 
                                                     <td style=" float: right" width="70px">