diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-16 08:24:46 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-16 08:24:46 +0200 |
| commit | f2c0c40f6e488f1a8e62bda9449b28115f343cac (patch) | |
| tree | ae1418141f85be49b7d8cb3d2a0e8b2a7acc4eb4 /include/conversation.php | |
| parent | f2e648d62fe7cafb9a55c7505687ea4d1c294778 (diff) | |
| parent | a65bd73bf3f4a1e6ccfcdf0a06c70a4f1f4182ce (diff) | |
| download | volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.tar.gz volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.tar.bz2 volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index e48a8e6d6..6bf673b97 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -278,6 +278,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { else $nickname = $a->user['nickname']; + // prevent private email from leaking. + if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) + continue; $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); if($item['author-link'] && (! $item['author-name'])) @@ -447,8 +450,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { else { // prevent private email reply to public conversation from leaking. - if($item['private'] && ! $threads[$threadsid]['private']) - continue; + if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) + continue; $comments_seen ++; $comment_lastcollapsed = false; |