diff options
| -rw-r--r-- | classes/User.php | 12 |
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'); |