X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=1112447d5048537d079b1f2030a6aa683041588d;hb=b03db4643f7f2874f881d576263e5b5446980e17;hp=5d013014b776c5eaaf0fe80ae788b02c3052ffe8;hpb=ab5669e09190d05be8bfa62f2b82846631c2409d;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 5d013014b7..1112447d50 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -562,15 +562,8 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 					continue;
 				}
 
-				if ($item['network'] == NETWORK_FEED) {
-					$item['author-avatar'] = $item['contact-avatar'];
-					$item['author-name'] = $item['contact-name'];
-					$item['owner-avatar'] = $item['contact-avatar'];
-					$item['owner-name'] = $item['contact-name'];
-				}
-
-				$profile_name = (strlen($item['author-name']) ? $item['author-name'] : $item['name']);
-				if ($item['author-link'] && !$item['author-name']) {
+				$profile_name = $item['author-name'];
+				if (!empty($item['author-link']) && empty($item['author-name'])) {
 					$profile_name = $item['author-link'];
 				}
 
@@ -779,7 +772,7 @@ function conversation_add_children($parents, $block_authors, $order, $uid) {
 		}
 		$thread_items = Item::selectForUser(local_user(), [], $condition, $params);
 
-		$comments = dba::inArray($thread_items);
+		$comments = Item::inArray($thread_items);
 
 		if (count($comments) != 0) {
 			$items = array_merge($items, $comments);