aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-14 00:51:16 -0700
committerfriendica <info@friendica.com>2015-03-14 00:51:16 -0700
commit88167718baba7ea9aa1e2055a3071091877f9733 (patch)
tree11b3e4f2368bff85933aa63234b462856a830d19
parentb76cdf82d298c92bdf5a59b6bf6b55da504a46ea (diff)
downloadvolse-hubzilla-88167718baba7ea9aa1e2055a3071091877f9733.tar.gz
volse-hubzilla-88167718baba7ea9aa1e2055a3071091877f9733.tar.bz2
volse-hubzilla-88167718baba7ea9aa1e2055a3071091877f9733.zip
revert and rethink
-rw-r--r--mod/network.php6
-rw-r--r--version.inc2
2 files changed, 4 insertions, 4 deletions
diff --git a/mod/network.php b/mod/network.php
index d2b9bc64c..30e046462 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 $abook_uids )
+ left join abook on item.owner_xchan = abook.abook_xchan
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.author_xchan = abook.abook_xchan $abook_uids )
+ left join abook on item.owner_xchan = abook.abook_xchan
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.author_xchan = abook.abook_xchan $abook_uids )
+ left join abook on item.owner_xchan = abook.abook_xchan
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 ",
diff --git a/version.inc b/version.inc
index 413fb869a..f31eec023 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-03-13.970
+2015-03-14.971