diff options
| author | Mario <mario@mariovavti.com> | 2018-08-27 10:02:58 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-08-27 10:02:58 +0200 |
| commit | 4c1944a08dcaacf1d638af60cb1f7679cb88c192 (patch) | |
| tree | a14eea0f66af3a524453edf4bdfec296262d53e3 /Zotlabs/Module | |
| parent | 95f870f1b41ff243a03617b368c8606354de8273 (diff) | |
| parent | a0c2bbac9d96a5461b65b5e0ff733a2fcd193dd4 (diff) | |
| download | volse-hubzilla-4c1944a08dcaacf1d638af60cb1f7679cb88c192.tar.gz volse-hubzilla-4c1944a08dcaacf1d638af60cb1f7679cb88c192.tar.bz2 volse-hubzilla-4c1944a08dcaacf1d638af60cb1f7679cb88c192.zip | |
Merge branch 'extend-convitems-dropdown' into 'dev'
Extend cog dropdown & temp fix for feed display of corrupt mids
See merge request hubzilla/core!1265
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Network.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index ca0ec7844..9eedf113d 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -510,7 +510,7 @@ class Network extends \Zotlabs\Web\Controller { if($load) { // Fetch a page full of parent items for this page - $r = q("SELECT item.parent AS item_id FROM item + $r = q("SELECT DISTINCT(item.parent) AS item_id FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids $item_thread_top $item_normal @@ -524,7 +524,7 @@ class Network extends \Zotlabs\Web\Controller { else { // this is an update - $r = q("SELECT item.parent AS item_id FROM item + $r = q("SELECT DISTINCT(item.parent) AS item_id FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids $item_normal_update $simple_update |