X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=f0d121a3cae4952f9d20e96dcbfc6f0b4470c931;hb=92679de2257ac8a14f405afe83dececde8505abd;hp=e2baed5c65a2cee55ef4fe15d2d7b321c03e18d7;hpb=b6f349076c952b9e57d9b2d9da3dae5259d68a23;p=friendica.git diff --git a/include/conversation.php b/include/conversation.php index e2baed5c65..f0d121a3ca 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -324,8 +324,7 @@ function conv_get_blocklist() $blocklist = []; foreach (explode(',', $str_blocked) as $entry) { - // The 4th parameter guarantees that there always will be a public contact entry - $cid = Contact::getIdForURL(trim($entry), 0, false, ['url' => trim($entry)]); + $cid = Contact::getIdForURL(trim($entry), 0, false); if (!empty($cid)) { $blocklist[] = $cid; } @@ -723,7 +722,7 @@ function conversation_fetch_comments($thread_items, bool $pinned, array $activit if (($row['gravity'] == GRAVITY_PARENT)) { $row['post-type'] = Item::PT_ANNOUNCEMENT; $row = array_merge($row, $activity); - $contact = Contact::getById($activity['author-id'], ['url', 'name', 'thumb']); + $contact = Contact::getById($activity['causer-id'], ['url', 'name', 'thumb']); $row['causer-link'] = $contact['url']; $row['causer-avatar'] = $contact['thumb']; $row['causer-name'] = $contact['name'];