Merge remote-tracking branch 'upstream/pull/1816'

[rails.git] / app / views / user / _contact.html.erb

diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb
index 08b982cd76c097f117d9fb891ce2e1f9e475196f..2697d0302d552a80a917d9be9451434eb348dda5 100644 (file)
--- a/app/views/user/_contact.html.erb
+++ b/app/views/user/_contact.html.erb
@@ -10,9 +10,9 @@
   <%= user_thumbnail contact %>
   <div class='activity-details'>
     <p class='deemphasize'>
   <%= user_thumbnail contact %>
   <div class='activity-details'>
     <p class='deemphasize'>

-      <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>
-      <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>
-        <% distance = @this_user.distance(contact) %>
+      <%= link_to h(contact.display_name), user_path(contact) %>
+      <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
+        <% distance = @user.distance(contact) %>

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