From a5ba14f89c9cc3868a990b00e3d959cf829ccacb Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Thu, 28 Oct 2010 09:42:14 -0700
Subject: [PATCH] nope that last fix I was too tired.  the problem is when
 someone sends me a request saying it is a response from me

---
 lib/diaspora/user/receiving.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
index b96b6d755..6d20651d8 100644
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@@ -83,11 +83,9 @@ module Diaspora
         request.person.save
         old_request =  Request.first(:id => request.id)
         Rails.logger.info("I got a reqest_id #{request.id} with old request #{old_request.inspect}")
-        if old_request
           request.aspect_id = old_request.aspect_id if old_request
           request.save
           receive_friend_request(request)
-        end
       end
 
       def receive_profile profile, xml