diff options
| author | zottel <github@zottel.net> | 2012-05-14 13:59:37 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-14 13:59:37 +0200 |
| commit | 584b15aaecbf6f58cda2031908f0319c6dfc0700 (patch) | |
| tree | 0b56a9e4de6c38a052878f2a5c18a05dae15c57c /include/conversation.php | |
| parent | c43a03e21bcd12b24be8a59741ec6591c1f651d7 (diff) | |
| parent | 59aefd9346fbd0d5c3cd9cdbf2158719221412f9 (diff) | |
| download | volse-hubzilla-584b15aaecbf6f58cda2031908f0319c6dfc0700.tar.gz volse-hubzilla-584b15aaecbf6f58cda2031908f0319c6dfc0700.tar.bz2 volse-hubzilla-584b15aaecbf6f58cda2031908f0319c6dfc0700.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; |