diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-11 20:39:06 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-11 20:39:06 -0400 |
| commit | 534a93f81c34b4b280986ad7e1bcee4278ea9299 (patch) | |
| tree | 01a59f25ace68cc384828e565e96f4d1e9715619 /include/conversation.php | |
| parent | 9c53a311de2899ca620bfaf75c58a514c55cacff (diff) | |
| parent | 2454028ef61a3ea1dd8308896c8bbf1f04f97ac9 (diff) | |
| download | volse-hubzilla-534a93f81c34b4b280986ad7e1bcee4278ea9299.tar.gz volse-hubzilla-534a93f81c34b4b280986ad7e1bcee4278ea9299.tar.bz2 volse-hubzilla-534a93f81c34b4b280986ad7e1bcee4278ea9299.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
Darkzero - fixed notifications bar.
diabook-theme: update mapquery and small fix
diabook-theme: add "population density 2010"-layer to EarthLayers-box
fix search/new against possible email leakage
better test of email reply visibility
diabook-theme:small fix
moderated comment templates
diabook-theme: small fix
diabook-theme: include prv_message autocomplete
fix PM replies after autocomplete changes
add photos to PM autocomplete, improved appearance
rev update
diabook-theme: small fix
* 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; |