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

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

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index 1479a1e4fbbd652e4f64021efed01a1f1bf963b4..d067bd4781b4acc73a53de16a3621c62cf2a3b76 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -4,11 +4,11 @@
      :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>
      :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>

-<%= content_tag :div, :class => "contact-activity clearfix", :data => { :user => user_data } do %>
+<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>

   <%= 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), user_path(contact) %>
+      <%= link_to 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 %>
       <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
         <% distance = @user.distance(contact) %>
         <% if distance < 1 %>