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 a0bbdd10499f43abbf6138d976c7a145e6d66402..7e1d8c2ba5d9a174534df794fd619ff454dcb4d4 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2157,7 +2157,8 @@ class Contact extends BaseObject
 
                if (!empty($contact)) {
             // Contact is blocked at user-level
-                   if (self::isBlockedByUser($contact['id'], $importer['id'])) {
+                   if (!empty($contact['id']) && !empty($importer['id']) &&
+                       self::isBlockedByUser($contact['id'], $importer['id'])) {
                        return false;
             }