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

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 284efe34e17e55fc5be657ffbd1e4b5362d82308..1d008959905e85a50428c0433c04dbe16799d8a8 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -224,7 +224,7 @@ class User < ActiveRecord::Base
   end
 
   def is_friends_with?(new_friend)
-    friendships.where(:friend_user_id => new_friend.id).exists?
+    friendships.where(:befriendee => new_friend).exists?
   end
 
   ##