From f4428679efe1d5c6126997db0b3d97fe5c451fe6 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 9 Aug 2010 11:44:13 -0700
Subject: [PATCH] First attempt at fixing warzombie friendingw

---
 app/controllers/dev_utilities_controller.rb | 4 ++--
 app/models/user.rb                          | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index f5f96683f..d8936e689 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -23,9 +23,9 @@ def warzombie
 
   def zombiefriends
     render :nothing => true
-    backer_info
+    bkr_info  = backer_info
     if User.owner.email == "tom@tom.joindiaspora.com" && Person.friends.first.nil? 
-      backer_info.each do |backer|
+      bkr_info.each do |backer|
         logger.info "Zombefriending #{backer['given_name']} #{backer['family_name']}"
         User.owner.send_friend_request_to("http://#{backer['username']}.joindiaspora.com/")
       end
diff --git a/app/models/user.rb b/app/models/user.rb
index 15b5c7182..b9199fcf7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -42,7 +42,8 @@ class User
 
   def accept_friend_request(friend_request_id)
     request = Request.where(:id => friend_request_id).first
-    pending_friends.delete(request.person)
+    n = pending_friends.delete(request.person)
+    
     friends << request.person
     save