summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-07 12:22:00 -0500
committerEvan Prodromou <evan@status.net>2009-11-07 12:22:00 -0500
commit1319002e1519fafb0e82fbfd2d2723abdb3112e7 (patch)
treeb1157b223701ce7ba94894e6ec40c43f2bfe9d21
parent73e45bbfd99f0aafc1b22ab4dbbfc4e4329fc254 (diff)
don't distribute group notices to inboxes for users who've blocked the author
-rw-r--r--classes/Notice.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index a9dbaa461..9886875cb 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -930,7 +930,10 @@ class Notice extends Memcached_DataObject
$users = $group->getUserMembers();
foreach ($users as $id) {
if (!array_key_exists($id, $ni)) {
- $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
+ $user = User::staticGet('id', $id);
+ if (!$user->hasBlocked($notice->profile_id)) {
+ $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
+ }
}
}
}