From: Michael <heluecht@pirati.ca>
Date: Thu, 22 Nov 2018 21:43:16 +0000 (+0000)
Subject: Checking for blocked user does now check for blocked domain as well
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb0140a62bdfd158b27f431444c20c804cd83d87;p=friendica.git

Checking for blocked user does now check for blocked domain as well
---

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 1c90d0c815..6d435c81c0 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1285,10 +1285,15 @@ class Contact extends BaseObject
 			return false;
 		}
 
-		$blocked = DBA::selectFirst('contact', ['blocked'], ['id' => $cid]);
+		$blocked = DBA::selectFirst('contact', ['blocked', 'url'], ['id' => $cid]);
 		if (!DBA::isResult($blocked)) {
 			return false;
 		}
+
+		if (Network::isUrlBlocked($blocked['url'])) {
+			return true;
+		}
+
 		return (bool) $blocked['blocked'];
 	}