mirror of
https://github.com/friendica/friendica
synced 2025-04-29 11:44:24 +02:00
Merge remote-tracking branch 'upstream/develop' into more-privacy
This commit is contained in:
commit
0ea93bfba1
2 changed files with 1 additions and 3 deletions
|
@ -1381,8 +1381,6 @@ class Conversation
|
|||
continue;
|
||||
}
|
||||
|
||||
$threadsid++;
|
||||
|
||||
// prevent private email from leaking.
|
||||
if ($item['network'] === Protocol::MAIL && $this->session->getLocalUserId() != $item['uid']) {
|
||||
continue;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue