summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-12-07 22:14:08 -0500
committerEvan Prodromou <evan@controlyourself.ca>2008-12-07 22:14:08 -0500
commitba8cc0df5987df4e80a9a2d0cefab7efcba13966 (patch)
tree1f8114c23b1b762df8e229964db354e2ebe7cfc5
parentfd6df5402e4e2d6bfb842c970f193250b0a371bd (diff)
don't save replies from a blocked profile to the blocking user
darcs-hash:20081208031408-5ed1f-dfdb46fbcf5390d890b4db47c64da0b70ace8096.gz
-rw-r--r--lib/util.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/util.php b/lib/util.php
index f6d5440f0..4fb58e7dc 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1401,6 +1401,11 @@ function common_save_replies($notice) {
$notice->update($orig);
}
}
+ # Don't save replies from blocked profile to local user
+ $recipient_user = User::staticGet('id', $recipient->id);
+ if ($recipient_user && $recipient_user->hasBlocked($sender)) {
+ continue;
+ }
$reply = new Reply();
$reply->notice_id = $notice->id;
$reply->profile_id = $recipient->id;
@@ -1422,6 +1427,11 @@ function common_save_replies($notice) {
$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
+ $t_user = User::staticGet('id', $t->id);
+ if ($t_user && $t_user->hasBlocked($sender)) {
+ continue;
+ }
$reply = new Reply();
$reply->notice_id = $notice->id;
$reply->profile_id = $t->id;