From 096cb19d1205952142b3ed85d3760e6af4364d49 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 17 Nov 2020 18:06:16 -0500 Subject: [PATCH] Suppress notice when causer-id exists but not causer-link in Model\Item::isAllowedByUser - Address https://github.com/friendica/friendica/issues/9252#issuecomment-723440980 --- src/Model/Item.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 0fcb445e0..9890c8a99 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -3980,12 +3980,12 @@ class Item // The causer is set during a thread completion, for example because of a reshare. It countains the responsible actor. if (!empty($item['causer-id']) && Contact\User::isBlocked($item['causer-id'], $user_id)) { - Logger::notice('Causer is blocked by user', ['causer-link' => $item['causer-link'], 'uid' => $user_id, 'item-uri' => $item['uri']]); + Logger::notice('Causer is blocked by user', ['causer-link' => $item['causer-link'] ?? $item['causer-id'], 'uid' => $user_id, 'item-uri' => $item['uri']]); return false; } if (!empty($item['causer-id']) && ($item['gravity'] === GRAVITY_PARENT) && Contact\User::isIgnored($item['causer-id'], $user_id)) { - Logger::notice('Causer is ignored by user', ['causer-link' => $item['causer-link'], 'uid' => $user_id, 'item-uri' => $item['uri']]); + Logger::notice('Causer is ignored by user', ['causer-link' => $item['causer-link'] ?? $item['causer-id'], 'uid' => $user_id, 'item-uri' => $item['uri']]); return false; }