summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-11-03 15:17:46 -0700
committerBrion Vibber <brion@pobox.com>2010-11-03 15:17:46 -0700
commit28e009898f6ce6dd72471a5ae4abbc91e6b00193 (patch)
treed5ec13999c152ea1e677cfb794d2bf638f4cbdb4 /lib
parent51a756c2117ec6804b38bea29f56dcc585781f47 (diff)
Fix for ticket #2852: skip sending favorite notification emails if the favoriter is someone you've blocked.
Diffstat (limited to 'lib')
-rw-r--r--lib/mail.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/mail.php b/lib/mail.php
index 30d743848..dd6a1a366 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -593,6 +593,10 @@ function mail_notify_fave($other, $user, $notice)
}
$profile = $user->getProfile();
+ if ($other->hasBlocked($profile)) {
+ // If the author has blocked us, don't spam them with a notification.
+ return;
+ }
$bestname = $profile->getBestName();