Don't try and show distances to friends if the user has no

home location set. Closes #2766.

diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb
index f019ccf159af08a7d913eb3e53fda9dd916dba5c..e0babce7eefda4b92ba5992b472d86d5e9ba2a39 100644 (file)
--- a/app/views/user/_contact.html.erb
+++ b/app/views/user/_contact.html.erb
@@ -4,7 +4,7 @@
   </td>
   <td>
     <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>
   </td>
   <td>
     <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>

-    <% if contact.home_lon and contact.home_lat %>
+    <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>

       <% distance = @this_user.distance(contact) %>
       <% if distance < 1 %>
         (<%= t 'user.view.m away', :count => (distance * 1000).round %>)
       <% distance = @this_user.distance(contact) %>
       <% if distance < 1 %>
         (<%= t 'user.view.m away', :count => (distance * 1000).round %>)