From 544f7f08e5fe2ca289404013444c3ea1680082ba Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 9 Aug 2010 10:38:13 -0700
Subject: [PATCH] MS IZ doesn't delete from pending friends since there is
 nothing in it

---
 app/models/request.rb | 1 -
 app/models/user.rb    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

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