diff options
author | Max Kostikov <max@kostikov.co> | 2021-03-10 19:41:46 +0000 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2021-03-10 19:41:46 +0000 |
commit | b729cee9e4aaf908d28835341171311532ae05d6 (patch) | |
tree | f47ec7020c314c9101d4ddceb222b608166d4825 /include/conversation.php | |
parent | 15b45af550cb59013cbf915c63635fdf03cdd73e (diff) | |
parent | 15bc5c64f3f4c3226e6329f8b8aa73df4aeb5e0b (diff) | |
download | volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.tar.gz volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.tar.bz2 volse-hubzilla-b729cee9e4aaf908d28835341171311532ae05d6.zip |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'include/conversation.php')
-rw-r--r-- | include/conversation.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index ae69b7a01..f3e5fafa7 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -865,7 +865,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $x = [ 'mode' => $mode, 'item' => $item ]; call_hooks('stream_item',$x); - if($x['item']['blocked']) + if(isset($x['item']['blocked'])) continue; $item = $x['item']; @@ -1563,7 +1563,7 @@ function sort_item_children($items) { $result = $items; usort($result,'sort_thr_created_rev'); foreach($result as $k => $i) { - if($result[$k]['children']) { + if(isset($result[$k]['children'])) { $result[$k]['children'] = sort_item_children($result[$k]['children']); } } @@ -1573,7 +1573,7 @@ function sort_item_children($items) { function add_children_to_list($children, &$arr) { foreach($children as $y) { $arr[] = $y; - if($y['children']) + if(isset($y['children'])) add_children_to_list($y['children'], $arr); } } |