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.

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');