diff options
author | Brion Vibber <brion@pobox.com> | 2010-09-20 15:57:46 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-09-20 16:00:25 -0700 |
commit | 521daf5562051d0cc319c35a0dceaae3e0fd49b7 (patch) | |
tree | 8bfec99b545a9964d39fa308d64eab93cd4df043 /classes/User.php | |
parent | 64cdbe6c5578df1dc49d8e3dd72451ab0ac96bd2 (diff) |
Ticket #2327: fixing block to remove the blocking user's subscription to the blockee if present; also cleaning up inbox delivery to apply the block checks more consistently, instead of just to group posts.
Diffstat (limited to 'classes/User.php')
-rw-r--r-- | classes/User.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/User.php b/classes/User.php index 8033229c4..4c25ee3d9 100644 --- a/classes/User.php +++ b/classes/User.php @@ -552,6 +552,9 @@ class User extends Memcached_DataObject if (Subscription::exists($other, $self)) { Subscription::cancel($other, $self); } + if (Subscription::exists($self, $other)) { + Subscription::cancel($self, $other); + } $block->query('COMMIT'); |