friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3941 from annando/children-merge 

Some posts weren't shown
This commit is contained in:
Hypolite Petovan 2017-11-24 16:49:21 -05:00 committed by GitHub
parent 5a0f33dca0 3046455b1c
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) {
$parents[$i]['children'] =
get_item_children($item_array, $parent, $thread_allowed)
+ get_item_children($item_array, $parent, false);
array_merge(get_item_children($item_array, $parent, $thread_allowed),
get_item_children($item_array, $parent, false));
}
foreach ($parents as $i => $parent) {