From a903dbd77ec1749d96e1d3891d2699873b8ddf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 16 Jun 2022 22:59:41 +0200 Subject: [PATCH 1/2] Wrong braces causing 'undefined index causer-id'. See #11632 --- src/Content/Conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index a82cb35e00..3bc2033f5a 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -154,7 +154,7 @@ class Conversation } // Skip when the causer of the parent is the same as the author of the announce - if (($verb == Activity::ANNOUNCE) && !empty($thread_parent['causer-id'] && ($thread_parent['causer-id'] == $activity['author-id']))) { + if ($verb == Activity::ANNOUNCE && !empty($thread_parent['causer-id']) && $thread_parent['causer-id'] == $activity['author-id']) { continue; } From 5106bb2881791662ac9a512918ed79c18908f50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Fri, 17 Jun 2022 09:40:29 +0200 Subject: [PATCH 2/2] Added parenthesis --- src/Content/Conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 3bc2033f5a..952b80e768 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -154,7 +154,7 @@ class Conversation } // Skip when the causer of the parent is the same as the author of the announce - if ($verb == Activity::ANNOUNCE && !empty($thread_parent['causer-id']) && $thread_parent['causer-id'] == $activity['author-id']) { + if (($verb == Activity::ANNOUNCE) && !empty($thread_parent['causer-id']) && ($thread_parent['causer-id'] == $activity['author-id'])) { continue; }