diff options
| author | friendica <info@friendica.com> | 2015-03-11 01:03:30 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-11 01:03:30 -0700 |
| commit | a40c19d19d31bba3fe037a9778c521461e2b0290 (patch) | |
| tree | 8c09cefac7bfb25360c19f212b02b0f46a79480e /mod/network.php | |
| parent | bfd123c59a61be1d667648263aa44c4a9e14a5fc (diff) | |
| parent | 0014cf4ff232328c3e3d0993eb8e9893a7c16f54 (diff) | |
| download | volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.tar.gz volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.tar.bz2 volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.zip | |
Merge branch 'master' into openid
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/network.php b/mod/network.php index 161b06804..d24d665d8 100644 --- a/mod/network.php +++ b/mod/network.php @@ -342,9 +342,11 @@ function network_content(&$a, $update = 0, $load = false) { $sys = get_sys_channel(); $uids = " and item.uid = " . intval($sys['channel_id']) . " "; $a->data['firehose'] = intval($sys['channel_id']); + $abook_uids = ""; } else { $uids = " and item.uid = " . local_channel() . " "; + $abook_uids = " and abook.abook_channel = " . local_channel() . " "; } if(get_pconfig(local_channel(),'system','network_list_mode')) @@ -376,7 +378,7 @@ function network_content(&$a, $update = 0, $load = false) { $items = q("SELECT item.*, item.id AS item_id, received FROM item left join abook on item.author_xchan = abook.abook_xchan - WHERE true $uids AND item_restrict = 0 + WHERE true $uids $abook_uids AND item_restrict = 0 and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $simple_update $sql_extra $sql_nets @@ -407,7 +409,7 @@ function network_content(&$a, $update = 0, $load = false) { $r = q("SELECT distinct item.id AS item_id, $ordering FROM item left join abook on item.author_xchan = abook.abook_xchan - WHERE true $uids AND item.item_restrict = 0 + WHERE true $uids $abook_uids AND item.item_restrict = 0 AND item.parent = item.id and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets @@ -421,7 +423,7 @@ function network_content(&$a, $update = 0, $load = false) { // update $r = q("SELECT item.parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan - WHERE true $uids AND item.item_restrict = 0 $simple_update + WHERE true $uids $abook_uids AND item.item_restrict = 0 $simple_update and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets ", intval(ABOOK_FLAG_BLOCKED) |