Merge branch '1.1.x'

2012-09-07 10:29:55 -04:00 · 2012-09-07 10:29:55 -04:00 · ba7e73ee97
commit ba7e73ee97
parent 9b97adc7ad f21881d5fa
1 changed files with 5 additions and 0 deletions
--- a/lib/mail.php
+++ b/lib/mail.php
@ -736,6 +736,11 @@ function mail_notify_attn($user, $notice)
        return;
    }

+    if ($user->hasBlocked($sender)) {
+        // If the author has blocked us, don't spam them with a notification.
+        return;
+    }
+
    $bestname = $sender->getBestName();

    common_switch_locale($user->language);