From fb0140a62bdfd158b27f431444c20c804cd83d87 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 22 Nov 2018 21:43:16 +0000 Subject: [PATCH] Checking for blocked user does now check for blocked domain as well --- src/Model/Contact.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 1c90d0c81..6d435c81c 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']; }