Escape ampersands in URLs when exporting HTML for embedding

[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 be1c241068736d2577806fdd99812197c9a6ee06..e0babce7eefda4b92ba5992b472d86d5e9ba2a39 100644 (file)
--- a/app/views/user/_contact.html.erb
+++ b/app/views/user/_contact.html.erb
@@ -1,14 +1,10 @@
 <tr>
   <td rowspan="2">
-    <% if contact.image %>
-      <%= image_tag url_for_file_column(contact, "image"), :class => "user_thumbnail" %>
-    <% else %>
-      <%= image_tag "anon_small.png" %>
-    <% end %>
+    <%= user_thumbnail contact %>
   </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 %>)