diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-03 17:17:20 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-03 17:17:20 -0700 |
| commit | 4adf2caaa687287cf82b930bb5a0c07d39c7afc0 (patch) | |
| tree | 670ce1e8c82b813ce86b6c8815e66ea6ea3a5adb /Zotlabs/Module/Pubstream.php | |
| parent | db82d303e217c2ca599a8b740ebb62339d373124 (diff) | |
| parent | 0fac35686b28825da69c77f9a903e4e24a7036fa (diff) | |
| download | volse-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/Pubstream.php')
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 5db485d21..ef818845c 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -21,6 +21,7 @@ class Pubstream extends \Zotlabs\Web\Controller { return; $item_normal = item_normal(); + $item_normal_update = item_normal_update(); $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); @@ -134,7 +135,7 @@ class Pubstream extends \Zotlabs\Web\Controller { $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 $item_normal + WHERE true $uids $item_normal_update AND item.parent = item.id $simple_update and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets" |