diff options
| author | zotlabs <mike@macgirvin.com> | 2018-04-16 20:28:22 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-04-16 20:28:22 -0700 |
| commit | 120e578a6778471cc03a04c47b9af34628fc6c8e (patch) | |
| tree | f5a1f7d53ccdeb4244476af5e7870361875feb6e /Zotlabs/Module/Pubstream.php | |
| parent | 411b8e48a3acc7ce283555a8e7fe82c7eadecfd6 (diff) | |
| parent | bef5be827d15bc54c9b88bc10313b28172069fef (diff) | |
| download | volse-hubzilla-120e578a6778471cc03a04c47b9af34628fc6c8e.tar.gz volse-hubzilla-120e578a6778471cc03a04c47b9af34628fc6c8e.tar.bz2 volse-hubzilla-120e578a6778471cc03a04c47b9af34628fc6c8e.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 79f205a22..45487e3a4 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -224,7 +224,7 @@ class Pubstream extends \Zotlabs\Web\Controller { ); } else { - $r = q("SELECT distinct parent AS item_id, $ordering FROM item + $r = q("SELECT parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan $net_query WHERE true $uids $item_normal_update |