From 26bebbe393ffa31792de54a0a6673ec18642a0be Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 12 Aug 2010 10:04:56 -0700
Subject: [PATCH] MS IZ changing it back

---
 app/models/user.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 35a68cd7d..9fef4edfb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -124,11 +124,7 @@ class User
     Rails.logger.debug("Receiving object:\n#{object.inspect}")
 
     if object.is_a? Retraction
-      if object.type == 'Person'
-        unfriend object.person_id
-      else
-        object.perform self.id
-      end
+      object.perform self.id 
     elsif object.is_a? Request
       person = Diaspora::Parser.get_or_create_person_object_from_xml( xml )
       person.serialized_key ||= object.exported_key