Merge pull request #7245 from annando/unify-constants

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 625c66b199889536f78dc458163d29d117e2481d..7e1d8c2ba5d9a174534df794fd619ff454dcb4d4 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2144,8 +2144,8 @@ class Contact extends BaseObject
                        return false;
                }
 
-               // Contact is blocked on node-level or user-level
-               if (!empty($pub_contact['blocked']) || !empty($contact['blocked'])) {
+               // Contact is blocked at node-level
+               if (self::isBlocked($datarray['author-id'])) {
                        return false;
                }
 
@@ -2156,6 +2156,12 @@ class Contact extends BaseObject
                $network = $pub_contact['network'];
 
                if (!empty($contact)) {
+            // Contact is blocked at user-level
+                   if (!empty($contact['id']) && !empty($importer['id']) &&
+                       self::isBlockedByUser($contact['id'], $importer['id'])) {
+                       return false;
+            }
+
                        // Make sure that the existing contact isn't archived
                        self::unmarkForArchival($contact);