X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FPost.php;h=3c01028292d0cd2c2ecabf95c2290bf6634dd39a;hb=e3692c01053d4714292449d1170ef2d60ad575d7;hp=a949c24aa704ffae28e5eed4ca44ff6fdd286ffc;hpb=4729fca5d944dee1ce6bbd7a0f00e9d45973838c;p=friendica.git

diff --git a/src/Object/Post.php b/src/Object/Post.php
index a949c24aa7..3c01028292 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -32,6 +32,7 @@ use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Photo;
 use Friendica\Model\Post as PostModel;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
@@ -123,8 +124,8 @@ class Post
 	/**
 	 * Fetch the privacy of the post
 	 *
-	 * @param array $item 
-	 * @return string 
+	 * @param array $item
+	 * @return string
 	 */
 	private function fetchPrivacy(array $item):string
 	{
@@ -453,11 +454,22 @@ class Post
 		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 = [
@@ -491,7 +503,7 @@ class Post
 			'profile_url'     => $profile_link,
 			'name'            => $profile_name,
 			'item_photo_menu_html' => DI::contentItem()->photoMenu($item, $formSecurityToken),
-			'thumb'           => DI::baseUrl()->remove(Contact::getAvatarUrlForId($author_avatar, Proxy::SIZE_THUMB, $author_updated)),
+			'thumb'           => DI::baseUrl()->remove($author_thumb),
 			'osparkle'        => $osparkle,
 			'sparkle'         => $sparkle,
 			'title'           => $title,
@@ -508,7 +520,7 @@ class Post
 			'shiny'           => $shiny,
 			'owner_self'      => $item['author-link'] == Session::get('my_url'),
 			'owner_url'       => $this->getOwnerUrl(),
-			'owner_photo'     => DI::baseUrl()->remove(Contact::getAvatarUrlForId($owner_avatar, Proxy::SIZE_THUMB, $owner_updated)),
+			'owner_photo'     => DI::baseUrl()->remove($owner_thumb),
 			'owner_name'      => $this->getOwnerName(),
 			'plink'           => Item::getPlink($item),
 			'browsershare'    => $browsershare,