From: Michael <heluecht@pirati.ca>
Date: Fri, 24 Nov 2017 21:39:12 +0000 (+0000)
Subject: Some posts weren't shown
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3046455b1cf1feefbaf5db332c042cdc4a45ee3a;p=friendica.git

Some posts weren't shown
---

diff --git a/include/conversation.php b/include/conversation.php
index 5e764e6706..c957107220 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -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) {