keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Michael 2023-07-16 09:41:55 +00:00
commit 0ea93bfba1
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Conversation.php
View file

@ -1381,8 +1381,6 @@ class Conversation
continue; continue;
} }
$threadsid++;
// prevent private email from leaking. // prevent private email from leaking.
if ($item['network'] === Protocol::MAIL && $this->session->getLocalUserId() != $item['uid']) { if ($item['network'] === Protocol::MAIL && $this->session->getLocalUserId() != $item['uid']) {
continue; continue;

2
src/Module/Moderation/Report/Create.php
View file

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