diff --git a/app/models/request.rb b/app/models/request.rb index e8b073aa6..6827ef32f 100644 --- a/app/models/request.rb +++ b/app/models/request.rb @@ -37,7 +37,6 @@ class Request def activate_friend from_user = Person.first(:url => self.callback_url).owner - from_user.pending_friends.delete(person) from_user.friends << person from_user.save diff --git a/app/models/user.rb b/app/models/user.rb index 8b51c20dd..3f7f73bc7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -71,6 +71,7 @@ class User else friend_request.person.save pending_friends << friend_request.person + save Rails.logger.info("#{self.real_name} has received a friend request") friend_request.save end