X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FConversation.php;h=04cdab4785e50b0e5efefbdddb322fe8b015e963;hb=65b86fe0d556829c09e8c8f5c707b868ad37dfe1;hp=a86c7f5081c1c2a504b7c450e147254b73ed93e0;hpb=e1f32f7f15c5b8e740ffe20f0390ea23e13a1f3a;p=friendica.git

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index a86c7f5081..04cdab4785 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -660,27 +660,6 @@ class Conversation
 						$pinned = '';
 					}
 
-					if (in_array($item['network'], [Protocol::FEED, Protocol::MAIL])) {
-						$owner_avatar  = $author_avatar  = $item['contact-id'];
-						$owner_updated = $author_updated = '';
-						$owner_thumb   = $author_thumb   = $item['contact-avatar'];
-					} else {
-						$owner_avatar   = $item['owner-id'];
-						$owner_updated  = $item['owner-updated'];
-						$owner_thumb    = $item['owner-avatar'];
-						$author_avatar  = $item['author-id'];
-						$author_updated = $item['author-updated'];
-						$author_thumb   = $item['author-avatar'];
-					}
-
-					if (empty($owner_thumb) || Photo::isPhotoURI($owner_thumb)) {
-						$owner_thumb = Contact::getAvatarUrlForId($owner_avatar, Proxy::SIZE_THUMB, $owner_updated);
-					}
-			
-					if (empty($author_thumb) || Photo::isPhotoURI($author_thumb)) {
-						$author_thumb = Contact::getAvatarUrlForId($author_avatar, Proxy::SIZE_THUMB, $author_updated);
-					}
-
 					$tmp_item = [
 						'template'             => $tpl,
 						'id'                   => ($preview ? 'P0' : $item['id']),
@@ -698,7 +677,7 @@ class Conversation
 						'name'                 => $profile_name,
 						'sparkle'              => $sparkle,
 						'lock'                 => false,
-						'thumb'                => $this->baseURL->remove($author_thumb),
+						'thumb'                => $this->baseURL->remove($this->item->getAuthorAvatar($item)),
 						'title'                => $title,
 						'body_html'            => $body_html,
 						'tags'                 => $tags['tags'],
@@ -719,7 +698,7 @@ class Conversation
 						'indent'               => '',
 						'owner_name'           => '',
 						'owner_url'            => '',
-						'owner_photo'          => $this->baseURL->remove($owner_thumb),
+						'owner_photo'          => $this->baseURL->remove($this->item->getOwnerAvatar($item)),
 						'plink'                => ItemModel::getPlink($item),
 						'edpost'               => false,
 						'pinned'               => $pinned,
@@ -975,7 +954,7 @@ class Conversation
 		$condition = DBA::mergeConditions($condition,
 			["`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)", $uid, Verb::getID(Activity::FOLLOW)]);
 
-		$thread_parents = Post::select(['uri-id', 'causer-id'], $condition, ['order' => ['uri-id' => false, 'uid' => true]]);
+		$thread_parents = Post::select(['uri-id', 'causer-id'], $condition, ['order' => ['uri-id' => false, 'uid']]);
 
 		$thr_parent = [];