only use effective uid if we deal with sys channel content
This commit is contained in:
parent
26b92c8564
commit
5c5fc0a62f
@ -98,6 +98,8 @@ class Hq extends \Zotlabs\Web\Controller {
|
|||||||
$sys = get_sys_channel();
|
$sys = get_sys_channel();
|
||||||
$sql_extra = item_permissions_sql($sys['channel_id']);
|
$sql_extra = item_permissions_sql($sys['channel_id']);
|
||||||
|
|
||||||
|
$sys_item = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! $update) {
|
if(! $update) {
|
||||||
@ -215,6 +217,8 @@ class Hq extends \Zotlabs\Web\Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!$r) {
|
if(!$r) {
|
||||||
|
$sys_item = true;
|
||||||
|
|
||||||
$r = q("SELECT item.id AS item_id FROM item
|
$r = q("SELECT item.id 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
|
||||||
WHERE mid = '%s' AND item.uid = %d $item_normal
|
WHERE mid = '%s' AND item.uid = %d $item_normal
|
||||||
@ -243,6 +247,8 @@ class Hq extends \Zotlabs\Web\Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!$r) {
|
if(!$r) {
|
||||||
|
$sys_item = true;
|
||||||
|
|
||||||
$r = q("SELECT 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
|
||||||
WHERE mid = '%s' AND item.uid = %d $item_normal_update $simple_update
|
WHERE mid = '%s' AND item.uid = %d $item_normal_update $simple_update
|
||||||
@ -268,7 +274,7 @@ class Hq extends \Zotlabs\Web\Controller {
|
|||||||
dbesc($parents_str)
|
dbesc($parents_str)
|
||||||
);
|
);
|
||||||
|
|
||||||
xchan_query($items,true,local_channel());
|
xchan_query($items,true,(($sys_item) ? local_channel() : 0));
|
||||||
$items = fetch_post_tags($items,true);
|
$items = fetch_post_tags($items,true);
|
||||||
$items = conv_sort($items,'created');
|
$items = conv_sort($items,'created');
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user