From 717be2b0457e5e90cf8ffa5960c83b03e61f4aa7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 12 Mar 2015 10:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E7=94=A8=E6=88=B7=E9=A6=96=E9=A1=B5=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
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 a7ed0aa25..d68e6abe5 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -217,7 +217,7 @@
                                                     </td>
                                                   </tr>
                                                  <% end %>
-                                              <% unless @user.user_extensions.location.empty?%>
+                                              <% unless @user.user_extensions.nil?&&@user.user_extensions.location.empty?%>
                                                 <tr>
 
                                                     <td style=" float: right" width="70px">