summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-12-03 17:44:34 -0800
committerZach Copley <zach@status.net>2009-12-03 17:44:34 -0800
commitd2b42577de54204d83eb8eac565c25edd4205542 (patch)
treeef99c0851f302579945ef25949ced6c226abbf22 /classes/User.php
parent2acdfff58b1ae7e6f9ed6eb9b65cdf97472289b5 (diff)
Was deleting wrong subscription during block. Now deletes the blockee's sub if it exists.
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php16
1 files changed, 1 insertions, 15 deletions
diff --git a/classes/User.php b/classes/User.php
index 4838fe1c7..2a4fab7d4 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');