clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better test of email reply visibility

This commit is contained in:
friendica 2012-05-11 05:11:53 -07:00
parent 49cd3f615d
commit 20229ce187
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/conversation.php
View File

@ -447,8 +447,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
else { else {
// prevent private email reply to public conversation from leaking. // prevent private email reply to public conversation from leaking.
if($item['private'] && ! $threads[$threadsid]['private']) if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
continue; continue;
$comments_seen ++; $comments_seen ++;
$comment_lastcollapsed = false; $comment_lastcollapsed = false;

2
include/items.php
View File

@ -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'); $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $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`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`, `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`,