From d2b42577de54204d83eb8eac565c25edd4205542 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 3 Dec 2009 17:44:34 -0800
Subject: [PATCH] Was deleting wrong subscription during block. Now deletes the
 blockee's sub if it exists.

---
 classes/User.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/classes/User.php b/classes/User.php
index 4838fe1c7d..2a4fab7d43 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -533,21 +533,7 @@ class User extends Memcached_DataObject
 
         // Cancel their subscription, if it exists
 
-        $result = subs_unsubscribe_to($this, $other);
-
-        if ($result !== true) {
-            common_log(LOG_WARNING,
-                sprintf(
-                    "Error trying to unsubscribe profile ID %d (%s) from user ID %d (%s): %s",
-                    $other->id,
-                    $other->nickname,
-                    $this->id,
-                    $this->nickname,
-                    $result
-                )
-            );
-            return false;
-        }
+        subs_unsubscribe_to($other->getUser(),$this->getProfile());
 
         $block->query('COMMIT');