summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-31 15:20:16 -0400
committerEvan Prodromou <evan@status.net>2010-03-31 15:20:16 -0400
commitd3f995846b2a849bc53eb965eb2607d8d1d6dd34 (patch)
tree2d60c3d6ca65e8b99fbdc730571d1bdea845f6db /classes
parentc1c7feedbd11cc291a0fb68ea8c4d322eb8bf538 (diff)
use Subscription::cancel() to cancel all subscriptions on block
Diffstat (limited to 'classes')
-rw-r--r--classes/User.php12
1 files changed, 3 insertions, 9 deletions
diff --git a/classes/User.php b/classes/User.php
index 659ec9467..2c256301c 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -525,8 +525,8 @@ class User extends Memcached_DataObject
common_log(LOG_WARNING,
sprintf(
"Profile ID %d (%s) tried to block his or herself.",
- $profile->id,
- $profile->nickname
+ $this->id,
+ $this->nickname
)
);
return false;
@@ -548,13 +548,7 @@ class User extends Memcached_DataObject
return false;
}
- // Cancel their subscription, if it exists
-
- $otherUser = User::staticGet('id', $other->id);
-
- if (!empty($otherUser)) {
- subs_unsubscribe_to($otherUser, $this->getProfile());
- }
+ Subscription::cancel($other, $this->getProfile());
$block->query('COMMIT');