aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-04-08 11:38:31 +0200
committerMario Vavti <mario@mariovavti.com>2018-04-08 11:38:31 +0200
commit7205ffb5c0f3973fadca198c4563b134662d6b17 (patch)
tree8daec0ec2203cb1b5e633f04131f0fd676f34677 /Zotlabs
parentbddf8cfde4811dbdc821c1c65a2042e13f05e109 (diff)
parentd47ea20aa8bb8219f7a0760e81ba3db542392390 (diff)
downloadvolse-hubzilla-7205ffb5c0f3973fadca198c4563b134662d6b17.tar.gz
volse-hubzilla-7205ffb5c0f3973fadca198c4563b134662d6b17.tar.bz2
volse-hubzilla-7205ffb5c0f3973fadca198c4563b134662d6b17.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Channel.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 3d3eb2a85..6a334b59a 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -204,7 +204,7 @@ class Channel extends \Zotlabs\Web\Controller {
$_SESSION['loadtime'] = datetime_convert();
}
else {
- $r = q("SELECT distinct parent AS item_id from item
+ $r = q("SELECT parent AS item_id from item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
WHERE uid = %d $item_normal_update
AND item_wall = 1 $simple_update