harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'extend-convitems-dropdown' into 'dev'

Browse Source 
Extend cog dropdown & temp fix for feed display of corrupt mids

See merge request hubzilla/core!1265
This commit is contained in:
Mario
2018-08-27 10:02:58 +02:00
parent 95f870f1b4 a0c2bbac9d
commit 4c1944a08d
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Network.php
View File

@@ -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