X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice.php;h=32a8b693c02accda14ffcf50f21259f1da71c1d4;hb=b10f362ede8c39746c168363bf4fa6481995592b;hp=a9dbaa461ba806593efbbeb40d4d6e3726aa1bc7;hpb=44ce8e2fcd1eba0d0f2723c246c1a021614e2763;p=quix0rs-gnu-social.git diff --git a/classes/Notice.php b/classes/Notice.php index a9dbaa461b..32a8b693c0 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject /* Add them to the database */ foreach(array_unique($hashtags) as $hashtag) { - /* elide characters we don't want in the tag */ + /* elide characters we do not want in the tag */ $this->saveTag($hashtag); } return true; @@ -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; + } } } } @@ -1102,7 +1105,7 @@ class Notice extends Memcached_DataObject if (empty($recipient)) { continue; } - // Don't save replies from blocked profile to local user + // Do not save replies from blocked profile to local user $recipient_user = User::staticGet('id', $recipient->id); if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) { continue; @@ -1128,7 +1131,7 @@ class Notice extends Memcached_DataObject $tagged = Profile_tag::getTagged($sender->id, $tag); foreach ($tagged as $t) { if (!$replied[$t->id]) { - // Don't save replies from blocked profile to local user + // Do not save replies from blocked profile to local user $t_user = User::staticGet('id', $t->id); if ($t_user && $t_user->hasBlocked($sender)) { continue;