forked from GNUsocial/gnu-social
Was deleting wrong subscription during block. Now deletes the blockee's sub if it exists.
This commit is contained in:
parent
2acdfff58b
commit
d2b42577de
@ -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');
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user