aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Network.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-03 17:17:20 -0700
committerzotlabs <mike@macgirvin.com>2017-09-03 17:17:20 -0700
commit4adf2caaa687287cf82b930bb5a0c07d39c7afc0 (patch)
tree670ce1e8c82b813ce86b6c8815e66ea6ea3a5adb /Zotlabs/Module/Network.php
parentdb82d303e217c2ca599a8b740ebb62339d373124 (diff)
parent0fac35686b28825da69c77f9a903e4e24a7036fa (diff)
downloadvolse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.tar.gz
volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.tar.bz2
volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Network.php')
-rw-r--r--Zotlabs/Module/Network.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 82c997270..db90e235f 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -44,6 +44,7 @@ class Network extends \Zotlabs\Web\Controller {
$channel = \App::get_channel();
$item_normal = item_normal();
+ $item_normal_update = item_normal_update();
$datequery = $datequery2 = '';
@@ -480,7 +481,7 @@ class Network extends \Zotlabs\Web\Controller {
// this is an update
$r = q("SELECT item.parent AS item_id FROM item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
- WHERE true $uids $item_normal $simple_update
+ WHERE true $uids $item_normal_update $simple_update
and (abook.abook_blocked = 0 or abook.abook_flags is null)
$sql_extra3 $sql_extra $sql_nets "
);