strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3915 from MrPetovan/issue/#2732-conv-orphans

Browse source 
Add orphan items as children to their top-level post
This commit is contained in:
Michael Vogel 2017-11-19 20:48:38 +01:00 committed by GitHub
commit 67c23ccb83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/conversation.php
View file

@ -1362,20 +1362,19 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
} }
/** /**
* Returns all the children in the given item list of the given parent, recusrsively * Plucks the children of the given parent from a given item list.
* or not.
* *
* @brief Returns all the children in the given item list of the given parent * @brief Plucks all the children in the given item list of the given parent
* *
* @param array $item_list * @param array $item_list
* @param array $parent * @param array $parent
* @param bool $recursive * @param bool $recursive
* @return type * @return type
*/ */
function get_item_children(array $item_list, array $parent, $recursive = true) function get_item_children(array &$item_list, array $parent, $recursive = true)
{ {
$children = []; $children = [];
foreach ($item_list as $item) { foreach ($item_list as $i => $item) {
if ($item['id'] != $item['parent']) { if ($item['id'] != $item['parent']) {
if ($recursive) { if ($recursive) {
// Fallback to parent-uri if thr-parent is not set // Fallback to parent-uri if thr-parent is not set
@ -1387,9 +1386,11 @@ function get_item_children(array $item_list, array $parent, $recursive = true)
if ($thr_parent == $parent['uri']) { if ($thr_parent == $parent['uri']) {
$item['children'] = get_item_children($item_list, $item); $item['children'] = get_item_children($item_list, $item);
$children[] = $item; $children[] = $item;
unset($item_list[$i]);
} }
} elseif ($item['parent'] == $parent['id']) { } elseif ($item['parent'] == $parent['id']) {
$children[] = $item; $children[] = $item;
unset($item_list[$i]);
} }
} }
} }
@ -1529,8 +1530,14 @@ function conv_sort(array $item_list, $order)
$thread_allowed = Config::get('system', 'thread_allow') && get_app()->theme_thread_allow; $thread_allowed = Config::get('system', 'thread_allow') && get_app()->theme_thread_allow;
/*
* Plucks children from the item_array, second pass collects eventual orphan
* items and add them as children of their top-level post.
*/
foreach ($parents as $i => $parent) { foreach ($parents as $i => $parent) {
$parents[$i]['children'] = get_item_children($item_array, $parent, $thread_allowed); $parents[$i]['children'] =
get_item_children($item_array, $parent, $thread_allowed)
+ get_item_children($item_array, $parent, false);
} }
foreach ($parents as $i => $parent) { foreach ($parents as $i => $parent) {