Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future)

This commit is contained in:
Brion Vibber 2010-04-10 17:52:40 -07:00
parent 5d96cf2eec
commit 71c828de89
1 changed files with 4 additions and 1 deletions

View File

@ -548,7 +548,10 @@ class User extends Memcached_DataObject
return false;
}
Subscription::cancel($other, $this->getProfile());
$self = $this->getProfile();
if (Subscription::exists($other, $self)) {
Subscription::cancel($other, $self);
}
$block->query('COMMIT');