diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-04-08 14:23:34 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-04-08 14:23:34 -0400 |
| commit | 808f3629211ff5ea6e9f53406b9c4c7c6bbb16b0 (patch) | |
| tree | 5beaa8edd3d7d49ecc3a6c976488791d46c4b6f8 /Zotlabs | |
| parent | 43cafcc761bc12f442c30ab952164736aa18f9d8 (diff) | |
| parent | 73248fd227cf2673663be8e1be0fdc4e9154e5e6 (diff) | |
| download | volse-hubzilla-808f3629211ff5ea6e9f53406b9c4c7c6bbb16b0.tar.gz volse-hubzilla-808f3629211ff5ea6e9f53406b9c4c7c6bbb16b0.tar.bz2 volse-hubzilla-808f3629211ff5ea6e9f53406b9c4c7c6bbb16b0.zip | |
Merge branch 'dev' into auto-save
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 2 |
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 |