From dfe4413463e7cbac0971fe8f3820f5f651dafdc2 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 19 Aug 2018 12:14:12 +0200 Subject: [PATCH] Avoid blocks with invalid entries in superblock (#5635) --- include/conversation.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 3ceccf36ae..665d9d4831 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -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; }