diff options
| author | zotlabs <mike@macgirvin.com> | 2018-02-04 15:53:56 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-02-04 15:53:56 -0800 |
| commit | 6ad14f4ca009bfa14aa0629d6a53212eb0d14e7f (patch) | |
| tree | c4848db3163817af1ba059ad23070028bcc56b41 /Zotlabs/Module/Pubstream.php | |
| parent | 3e7dffb6765f1d3120fd8fb58bb38c70c9dddcd6 (diff) | |
| parent | 9d55a254dcd39e2a77a1c24625adba69d16acb7a (diff) | |
| download | volse-hubzilla-6ad14f4ca009bfa14aa0629d6a53212eb0d14e7f.tar.gz volse-hubzilla-6ad14f4ca009bfa14aa0629d6a53212eb0d14e7f.tar.bz2 volse-hubzilla-6ad14f4ca009bfa14aa0629d6a53212eb0d14e7f.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 2c25e2ce0..16a5fdbba 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -196,10 +196,10 @@ class Pubstream extends \Zotlabs\Web\Controller { } else { // Fetch a page full of parent items for this page - $r = q("SELECT distinct item.id AS item_id, $ordering FROM item + $r = q("SELECT item.id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan $net_query - WHERE true $uids $item_normal + WHERE item_thread_top = 1 $uids $item_normal AND item.parent = item.id and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets $net_query2 |