From 521daf5562051d0cc319c35a0dceaae3e0fd49b7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 15:57:46 -0700 Subject: 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. --- classes/User.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes/User.php') 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'); -- cgit v1.2.3-54-g00ecf