aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Pubstream.php
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2018-04-16 17:27:14 +0200
committerGitHub <noreply@github.com>2018-04-16 17:27:14 +0200
commit283e5d3a5c9557195a640de5f0acefc884e904bb (patch)
tree86d32da9fc05d15491f4ccf04b27ea223307f323 /Zotlabs/Module/Pubstream.php
parent99dc1614836df2b69ee40382fc4b73546a847a60 (diff)
parentbef5be827d15bc54c9b88bc10313b28172069fef (diff)
downloadvolse-hubzilla-283e5d3a5c9557195a640de5f0acefc884e904bb.tar.gz
volse-hubzilla-283e5d3a5c9557195a640de5f0acefc884e904bb.tar.bz2
volse-hubzilla-283e5d3a5c9557195a640de5f0acefc884e904bb.zip
Merge pull request #8 from redmatrix/dev
Dev
Diffstat (limited to 'Zotlabs/Module/Pubstream.php')
-rw-r--r--Zotlabs/Module/Pubstream.php2
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