]> git.mxchange.org Git - friendica.git/commitdiff
Checking for blocked user does now check for blocked domain as well
authorMichael <heluecht@pirati.ca>
Thu, 22 Nov 2018 21:43:16 +0000 (21:43 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 22 Nov 2018 21:43:16 +0000 (21:43 +0000)
src/Model/Contact.php

index 1c90d0c815e0eedbd7fd048ccd2ead5797630175..6d435c81c0b9e8ea431cb19416b10af1cc3ae11b 100644 (file)
@@ -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'];
        }