diff options
| author | friendica <info@friendica.com> | 2012-05-11 05:11:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-05-11 05:11:53 -0700 |
| commit | 20229ce18719b82b1a4d3ed2d8fd4b265cfbc57e (patch) | |
| tree | 6721afe0e5869512d8e0c81d4f7c99321f7c61de | |
| parent | 49cd3f615d83cbb9eac01a39b16d121cab86bc8e (diff) | |
| download | volse-hubzilla-20229ce18719b82b1a4d3ed2d8fd4b265cfbc57e.tar.gz volse-hubzilla-20229ce18719b82b1a4d3ed2d8fd4b265cfbc57e.tar.bz2 volse-hubzilla-20229ce18719b82b1a4d3ed2d8fd4b265cfbc57e.zip | |
better test of email reply visibility
| -rw-r--r-- | include/conversation.php | 4 | ||||
| -rw-r--r-- | include/items.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index e48a8e6d6..ff68462ab 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -447,8 +447,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; diff --git a/include/items.php b/include/items.php index b1dc1708f..129499967 100644 --- a/include/items.php +++ b/include/items.php @@ -119,7 +119,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s'); $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, + `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`, |