aboutsummaryrefslogtreecommitdiffstats
path: root/mod/network.php
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2015-03-14 10:58:00 +1100
committerRedMatrix <info@friendica.com>2015-03-14 10:58:00 +1100
commit27e92ff2773cd12306bd2ce235d7fbea8f0e1bd4 (patch)
tree303474829a6375d2e17c1ebcb402b7a34d0784e9 /mod/network.php
parentf823e2e2ed9b017bab07dca92a43f310e49f3ecd (diff)
parente732fbe8e8a876ff76cbc7930a34f5adca4ffbd6 (diff)
downloadvolse-hubzilla-27e92ff2773cd12306bd2ce235d7fbea8f0e1bd4.tar.gz
volse-hubzilla-27e92ff2773cd12306bd2ce235d7fbea8f0e1bd4.tar.bz2
volse-hubzilla-27e92ff2773cd12306bd2ce235d7fbea8f0e1bd4.zip
Merge pull request #929 from zzottel/master
fix posts not showing up in network if author is not in connections
Diffstat (limited to 'mod/network.php')
-rw-r--r--mod/network.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/network.php b/mod/network.php
index 691e860d7..642fc4f43 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.author_xchan = abook.abook_xchan
+ left join abook on item.owner_xchan = abook.abook_xchan
WHERE true $uids $abook_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.author_xchan = abook.abook_xchan
+ left join abook on item.owner_xchan = abook.abook_xchan
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)
@@ -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.author_xchan = abook.abook_xchan
+ left join abook on item.owner_xchan = abook.abook_xchan
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 ",