bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Flatten children when threads are disabled

Browse source
This commit is contained in:
Domovoy 2012-08-03 22:28:21 +02:00
commit 8742beb772
3 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
include/conversation.php
View file

@ -581,13 +581,27 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
}
$item_result['children'] = array();
// Show children of children only if enabled
if(count($item['children'])
&& (($thread_level < 2) || get_config('system','thread_allow'))) {
if(count($item['children'])) {
$item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, ($thread_level + 1));
}
$item_result['private'] = $item['private'];
$item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
/*
* I don't like this very much...
*/
if(get_config('system','thread_allow')) {
$item_result['flatten'] = false;
$item_result['threaded'] = true;
}
else {
$item_result['flatten'] = true;
$item_result['threaded'] = false;
if(!$toplevelpost) {
$item_result['comment'] = false;
}
}
$result[] = $item_result;
}
@ -1134,9 +1148,16 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
function get_item_children($arr, $parent) {
$children = array();
foreach($arr as $item) {
if(($item['id'] != $item['parent']) && ($item['thr-parent'] == $parent['uri'])) {
$item['children'] = get_item_children($arr, $item);
$children[] = $item;
if($item['id'] != $item['parent']) {
if(get_config('system','thread_allow')) {
if($item['thr-parent'] == $parent['uri']) {
$item['children'] = get_item_children($arr, $item);
$children[] = $item;
}
}
else if($item['parent'] == $parent['id']) {
$children[] = $item;
}
}
}
return $children;