Modified: trunk/app/views/users/_listing.rhtml (2770 => 2771)
--- trunk/app/views/users/_listing.rhtml 2011-10-31 09:28:46 UTC (rev 2770)
+++ trunk/app/views/users/_listing.rhtml 2011-10-31 12:08:08 UTC (rev 2771)
@@ -83,7 +83,7 @@
<% if logged_in? && this_user_is_friend_of_current_user %>
<% master_id, friendship_obj = current_user.friendship_from_self_id_and_friends_id(user.id) %>
- <%= icon "friend_delete", user_friendship_path(master_id, friendship_obj) + "?return_to=" + currentusers_things_url('friends'), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %>
+ <%= icon "friend_delete", user_friendship_path(current_user, friendship_obj) + "?return_to=" + currentusers_things_url('friends'), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %>
<% end %>
<% end %>
Modified: trunk/app/views/users/show.rhtml (2770 => 2771)
--- trunk/app/views/users/show.rhtml 2011-10-31 09:28:46 UTC (rev 2770)
+++ trunk/app/views/users/show.rhtml 2011-10-31 12:08:08 UTC (rev 2771)
@@ -47,7 +47,7 @@
<li><%= icon("message", new_message_path(:user_id => @user.id), nil, nil, "Send Message") %></li>
<% if this_user_is_friend_of_current_user %>
<% master_id, friendship_obj = current_user.friendship_from_self_id_and_friends_id(@user.id) %>
- <li><%= icon "friend_delete", user_friendship_path(master_id, friendship_obj) + "?return_to=" + user_path(@user), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %></li>
+ <li><%= icon "friend_delete", user_friendship_path(current_user, friendship_obj) + "?return_to=" + user_path(@user), nil, {:confirm => "Are you sure you want to remove this user from your friend list?", :method => :delete}, "Cancel Friendship" %></li>
<% end %>
<% end %>