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

finally fix channel query

Browse Source
This commit is contained in:
Mario Vavti 2018-02-09 20:36:14 +01:00
parent 5f229d81e9
commit 6cc3294395
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Module/Channel.php
View File

@ -204,7 +204,7 @@ class Channel extends \Zotlabs\Web\Controller {
$_SESSION['loadtime'] = datetime_convert(); $_SESSION['loadtime'] = datetime_convert();
} }
else { else {
$r = q("SELECT distinct parent AS item_id, created from item $r = q("SELECT distinct parent AS item_id from item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
WHERE uid = %d $item_normal_update WHERE uid = %d $item_normal_update
AND item_wall = 1 $simple_update AND item_wall = 1 $simple_update
@ -249,11 +249,11 @@ class Channel extends \Zotlabs\Web\Controller {
} }
} }
else { else {
$r = q("SELECT DISTINCT item.parent AS item_id FROM item $r = q("SELECT item.parent AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
WHERE true and uid = %d $item_normal WHERE true and uid = %d $item_normal
AND (abook.abook_blocked = 0 or abook.abook_flags is null) AND (abook.abook_blocked = 0 or abook.abook_flags is null)
AND item.item_wall = 1 AND item.item_thread_top AND item.mid = item.parent_mid AND item.item_wall = 1 AND item.item_thread_top = 1
$sql_extra $sql_extra2 $sql_extra $sql_extra2
ORDER BY created DESC $pager_sql ", ORDER BY created DESC $pager_sql ",
intval(\App::$profile['profile_uid']) intval(\App::$profile['profile_uid'])