diff options
author | Max Kostikov <max@kostikov.co> | 2021-04-29 09:32:02 +0000 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2021-04-29 09:32:02 +0000 |
commit | 0cbdeb7bf16f1fb0d03038dd5af324b7cdd7e850 (patch) | |
tree | 2229673706f8c83d4f4789b68c339b78a8c3b299 /Zotlabs/Module/Display.php | |
parent | 61cf92ebddcad92d79d831178d3c7c9ed58d62e9 (diff) | |
parent | 6be464ef8484063690840e6b06e7540f7416788a (diff) | |
download | volse-hubzilla-0cbdeb7bf16f1fb0d03038dd5af324b7cdd7e850.tar.gz volse-hubzilla-0cbdeb7bf16f1fb0d03038dd5af324b7cdd7e850.tar.bz2 volse-hubzilla-0cbdeb7bf16f1fb0d03038dd5af324b7cdd7e850.zip |
Merge branch 'dev' into 'dev'
Dev Sync
See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs/Module/Display.php')
-rw-r--r-- | Zotlabs/Module/Display.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index eb97e77a0..21d3e2e08 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -325,7 +325,7 @@ class Display extends \Zotlabs\Web\Controller { if($parents_str) { $items = q("SELECT item.*, item.id AS item_id FROM item - WHERE parent in ( %s ) $item_normal ", + WHERE parent in ( %s ) $sql_extra $item_normal ", dbesc($parents_str) ); xchan_query($items); |