Merge remote-tracking branch 'upstream/develop' into more-privacy

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;

src/Module/Moderation/Report/Create.php

@@ -338,7 +338,7 @@ class Create extends BaseModule
 			'$category' => $category,
 			'$rules'    => $rules ?? [],
 			'$comment'  => BBCode::convertForUriId($contact['uri-id'] ?? 0, $this->session->get('report_comment') ?? '', BBCode::EXTERNAL),
-			'$posts'    => count($request['uri-ids']),
+			'$posts'    => count($request['uri-ids'] ?? []),
 		]);
 	}
 }