From f87c105518caa8f0e7d6de74d1e075e6433b0e85 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 13 Jul 2023 23:51:03 -0400 Subject: [PATCH 1/2] Remove unused variable trheadids from Content\Conversation - Address https://github.com/friendica/friendica/issues/13157#issuecomment-1635208668 --- src/Content/Conversation.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 6cad2b980..710422ee7 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -1381,8 +1381,6 @@ class Conversation continue; } - $threadsid++; - // prevent private email from leaking. if ($item['network'] === Protocol::MAIL && $this->session->getLocalUserId() != $item['uid']) { continue; From 8b5a49fb5c2c8fdd4b519e1be7305960f54b4caa Mon Sep 17 00:00:00 2001 From: Steffen K9 Date: Sat, 15 Jul 2023 14:41:29 +0200 Subject: [PATCH 2/2] Fix WSOD when creating a report using PHP8.x Fixes https://github.com/friendica/friendica/issues/13277 --- src/Module/Moderation/Report/Create.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Moderation/Report/Create.php b/src/Module/Moderation/Report/Create.php index 0e0e4c925..019a19ced 100644 --- a/src/Module/Moderation/Report/Create.php +++ b/src/Module/Moderation/Report/Create.php @@ -338,7 +338,7 @@ class Create extends BaseModule '$category' => $category, '$rules' => $rules ?? [], '$comment' => BBCode::convert($this->session->get('report_comment') ?? '', false, ), - '$posts' => count($request['uri-ids']), + '$posts' => count($request['uri-ids'] ?? []), ]); } }