Merge branch 'admin-sections/4' into 0.9.x

[quix0rs-gnu-social.git] / lib / mail.php

diff --git a/lib/mail.php b/lib/mail.php
index 6e74d18066443097732930922e877fb490686747..dffac32626e1e3ee3b48ee70045c53729926d31b 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -546,6 +546,10 @@ function mail_notify_message($message, $from=null, $to=null)
 
 function mail_notify_fave($other, $user, $notice)
 {
+    if (!$user->hasRight(Right::EMAILONFAVE)) {
+        return;
+    }
+
     $profile = $user->getProfile();
 
     $bestname = $profile->getBestName();