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

diff --cc src/Module/Moderation/Report/Create.php
index 1185730abafbd08783024ea601bf68a05d85e43c,019a19cedb31ae988742dca6054c216cd4ddae68..e309df3c1845f2ed4cf22a191af2144ed0a445cd
--- 1/src/Module/Moderation/Report/Create.php
--- 2/src/Module/Moderation/Report/Create.php
+++ b/src/Module/Moderation/Report/Create.php
@@@ -337,8 -337,8 +337,8 @@@ class Create extends BaseModul
                        '$contact'  => $contact,
                        '$category' => $category,
                        '$rules'    => $rules ?? [],
 -                      '$comment'  => BBCode::convert($this->session->get('report_comment') ?? '', false, ),
 +                      '$comment'  => BBCode::convertForUriId($contact['uri-id'] ?? 0, $this->session->get('report_comment') ?? '', BBCode::EXTERNAL),
-                       '$posts'    => count($request['uri-ids']),
+                       '$posts'    => count($request['uri-ids'] ?? []),
                ]);
        }
  }