Set server_url to test.host in test environments

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

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 87eb9b45feb1c44027c7317e679820d79e8334c5..aee000a97b001571d78f45603082afbd08443f7d 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -194,7 +194,7 @@
       <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
     <% end %>
 
       <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
     <% end %>
 

-    <% friends = @user.friends.collect(&:befriendee) %>
+    <% friends = @user.friends %>

     <% nearby = @user.nearby - friends %>
 
   <div class="activity-block column-1">
     <% nearby = @user.nearby - friends %>
 
   <div class="activity-block column-1">