diff options
| author | friendica <info@friendica.com> | 2015-03-14 01:03:37 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-14 01:03:37 -0700 |
| commit | cc2c7bbcd89bf3b937b1248519d23bde1179190f (patch) | |
| tree | f88d560be1406de46ed22e8ad9aaa68addaabb20 | |
| parent | 88167718baba7ea9aa1e2055a3071091877f9733 (diff) | |
| download | volse-hubzilla-cc2c7bbcd89bf3b937b1248519d23bde1179190f.tar.gz volse-hubzilla-cc2c7bbcd89bf3b937b1248519d23bde1179190f.tar.bz2 volse-hubzilla-cc2c7bbcd89bf3b937b1248519d23bde1179190f.zip | |
revert the revert - that is working. My test was bad.
| -rw-r--r-- | mod/network.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/network.php b/mod/network.php index 30e046462..d2b9bc64c 100644 --- a/mod/network.php +++ b/mod/network.php @@ -377,7 +377,7 @@ function network_content(&$a, $update = 0, $load = false) { // "New Item View" - show all items unthreaded in reverse created date order $items = q("SELECT item.*, item.id AS item_id, received FROM item - left join abook on item.owner_xchan = abook.abook_xchan + left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) WHERE true $uids AND item_restrict = 0 and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $simple_update @@ -408,7 +408,7 @@ function network_content(&$a, $update = 0, $load = false) { // Fetch a page full of parent items for this page $r = q("SELECT distinct item.id AS item_id, $ordering FROM item - left join abook on item.owner_xchan = abook.abook_xchan + left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) WHERE true $uids AND item.item_restrict = 0 AND item.parent = item.id and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) @@ -422,7 +422,7 @@ function network_content(&$a, $update = 0, $load = false) { if(! $firehose) { // update $r = q("SELECT item.parent AS item_id FROM item - left join abook on item.owner_xchan = abook.abook_xchan + left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) WHERE true $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 ", |