diff options
author | Evan Prodromou <evan@status.net> | 2009-11-07 13:03:52 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-07 13:03:52 -0500 |
commit | d9cde0ef80ee838a99035d44f0286b3cc902e332 (patch) | |
tree | ac9d74d52a06890db71f61ac934e75b937c19753 /classes/Notice.php | |
parent | f2b642ce822c480cfc418c38106cc18c3a428cf4 (diff) | |
parent | 2d8ad0409d8e78ec35a65156bc375eacbe561963 (diff) |
Merge branch '0.9.x' into userflag
Diffstat (limited to 'classes/Notice.php')
-rw-r--r-- | classes/Notice.php | 5 |
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; + } } } } |