keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3941 from annando/children-merge

Browse source 
Some posts weren't shown
This commit is contained in:
Hypolite Petovan 2017-11-24 16:49:21 -05:00 committed by GitHub
commit 6ecc464a68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/conversation.php
View file

@ -1536,8 +1536,8 @@ function conv_sort(array $item_list, $order)
*/ */
foreach ($parents as $i => $parent) { foreach ($parents as $i => $parent) {
$parents[$i]['children'] = $parents[$i]['children'] =
get_item_children($item_array, $parent, $thread_allowed) array_merge(get_item_children($item_array, $parent, $thread_allowed),
+ get_item_children($item_array, $parent, false); get_item_children($item_array, $parent, false));
} }
foreach ($parents as $i => $parent) { foreach ($parents as $i => $parent) {