Avoid blocks with invalid entries in superblock (#5635)
authorMichael Vogel <icarus@dabo.de>
Sun, 19 Aug 2018 10:14:12 +0000 (12:14 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 19 Aug 2018 10:14:12 +0000 (12:14 +0200)
include/conversation.php

index 3ceccf3..665d9d4 100644 (file)
@@ -412,7 +412,8 @@ function conv_get_blocklist()
        $blocklist = [];
 
        foreach (explode(',', $str_blocked) as $entry) {
-               $cid = Contact::getIdForURL(trim($entry), 0, true);
+               // The 4th parameter guarantees that there always will be a public contact entry
+               $cid = Contact::getIdForURL(trim($entry), 0, true, ['url' => trim($entry)]);
                if (!empty($cid)) {
                        $blocklist[] = $cid;
                }