Prevent contact relationships with node- or user-level blocked contacts

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 18b60d2121090b09e7fd09229eef637b4660e70b..625c66b199889536f78dc458163d29d117e2481d 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2137,13 +2137,18 @@ class Contact extends BaseObject
                        return false;
                }
 
-               $fields = ['url', 'name', 'nick', 'photo', 'network'];
+               $fields = ['url', 'name', 'nick', 'photo', 'network', 'blocked'];
                $pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]);
                if (!DBA::isResult($pub_contact)) {
                        // Should never happen
                        return false;
                }
 
+               // Contact is blocked on node-level or user-level
+               if (!empty($pub_contact['blocked']) || !empty($contact['blocked'])) {
+                       return false;
+               }
+
                $url = defaults($datarray, 'author-link', $pub_contact['url']);
                $name = $pub_contact['name'];
                $photo = $pub_contact['photo'];