From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 20 May 2019 20:34:17 +0000 (-0400)
Subject: Use self::isBlocked and self:isBlockedByUser in Model\Contact::addRelationship
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=14a78807d7d9b5a0f6ae8fd10ab3b4476a410b9d;p=friendica.git

Use self::isBlocked and self:isBlockedByUser in Model\Contact::addRelationship
---

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 625c66b199..a0bbdd1049 100644
--- 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,11 @@ class Contact extends BaseObject
 		$network = $pub_contact['network'];
 
 		if (!empty($contact)) {
+            // Contact is blocked at user-level
+		    if (self::isBlockedByUser($contact['id'], $importer['id'])) {
+		        return false;
+            }
+
 			// Make sure that the existing contact isn't archived
 			self::unmarkForArchival($contact);