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.

2010-09-20 15:57:46 -07:00
parent 64cdbe6c55
commit 521daf5562
2 changed files with 23 additions and 13 deletions
--- 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');