diff options
| -rw-r--r-- | Zotlabs/Module/Display.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Hq.php | 4 | ||||
| -rw-r--r-- | include/items.php | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 4b5b69405..07973431c 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -290,8 +290,8 @@ class Display extends Controller { if($r) { $parents_str = ids_to_querystr($r,'item_id'); if($parents_str) { - $thr_parents_str = stringify_array(get_recursive_thr_parents($target_item), true); - $items = items_by_parent_ids($parents_str, $thr_parents_str, $permission_sql); + $thr_parents = get_recursive_thr_parents($target_item); + $items = items_by_parent_ids($parents_str, $thr_parents, $permission_sql); xchan_query($items); $items = fetch_post_tags($items,true); diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 890e82086..562278973 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -200,8 +200,8 @@ class Hq extends \Zotlabs\Web\Controller { } if($r) { - $thr_parents_str = stringify_array(get_recursive_thr_parents($target_item), true); - $items = items_by_parent_ids($r[0]['item_id'], $thr_parents_str); + $thr_parents = get_recursive_thr_parents($target_item); + $items = items_by_parent_ids($r[0]['item_id'], $thr_parents); xchan_query($items,true,(($sys_item) ? local_channel() : 0)); $items = fetch_post_tags($items,true); diff --git a/include/items.php b/include/items.php index 740116b25..55d768e28 100644 --- a/include/items.php +++ b/include/items.php @@ -5444,18 +5444,19 @@ function item_by_item_id(int $id): array * ATTENTION: no permissions for the pa are checked here!!! * Permissions MUST be checked by the function which returns the ids. * @param string $ids - a string with ids separated by comma - * @param string $thr_parents (optional) - a string with thr_parent mids separated by comma + * @param array $thr_parents (optional) - a string with thr_parent mids separated by comma * which will be included * @param string $permission_sql (optional) - SQL provided by item_permission_sql() from the calling module * @param bool $blog_mode (optional) - if set to yes only the parent items will be returned */ -function items_by_parent_ids(string $ids, string $thr_parents = '', string $permission_sql = '', bool $blog_mode = false): array +function items_by_parent_ids(string $ids, array $thr_parents = [], string $permission_sql = '', bool $blog_mode = false): array { if (!$ids) { return []; } + $thread_allow = ((local_channel()) ? PConfig::Get(local_channel(), 'system', 'thread_allow', true) : Config::Get('system', 'thread_allow', true)); $item_normal_sql = item_normal(); @@ -5465,7 +5466,8 @@ function items_by_parent_ids(string $ids, string $thr_parents = '', string $perm $thr_parent_sql = (($thread_allow) ? " AND item.thr_parent = item.parent_mid " : ''); if ($thr_parents && $thread_allow) { - $thr_parent_sql = " AND item.thr_parent IN (" . protect_sprintf($thr_parents) . ") "; + $thr_parent_str = stringify_array($thr_parents, true); + $thr_parent_sql = " AND item.thr_parent IN (" . protect_sprintf($thr_parent_str) . ") "; } if ($blog_mode) { |