X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=85938ca0f0d6316e542a5bdb5daf829a7c8ae30c;hb=5e3a55915d7fdd554d711b2b5b619552a492c090;hp=c82bbe58fc5204857c3122d9d0aabe78d9d7dca9;hpb=f69d73b5ff09b8189b77be1812eed21939b6614e;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index c82bbe58fc..85938ca0f0 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -806,7 +806,9 @@ function conversation_fetch_comments($thread_items) {
 			$actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
 			$created = $row['created'];
 		}
-		if ($row['gravity'] == GRAVITY_PARENT) {
+
+		if ((($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && !in_array($row['network'], [Protocol::DIASPORA])) &&
+			(empty($row['contact-uid']) || !in_array($row['network'], Protocol::NATIVE_SUPPORT))) {
 			$parentlines[] = $lineno;
 		}
 
@@ -818,11 +820,9 @@ function conversation_fetch_comments($thread_items) {
 
 	if (!empty($actor)) {
 		foreach ($parentlines as $line) {
-			if (!in_array($comments[$line]['network'], [Protocol::DIASPORA]) && !$comments[$line]['origin']) {
-				$comments[$line]['owner-link'] = $actor['link'];
-				$comments[$line]['owner-avatar'] = $actor['avatar'];
-				$comments[$line]['owner-name'] = $actor['name'];
-			}
+			$comments[$line]['owner-link'] = $actor['link'];
+			$comments[$line]['owner-avatar'] = $actor['avatar'];
+			$comments[$line]['owner-name'] = $actor['name'];
 		}
 	}
 	return $comments;