friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5013 from annando/feed-avatar 

For feed items show the avatar of the local user
pull/5015/head
Hypolite Petovan 2018-05-09 17:22:55 -04:00 committed by GitHub
parent 5650d09504 ed664b1091
commit 8612e44d19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Object/Post.php
View File

@ -199,22 +199,12 @@ class Post extends BaseObject
$profile_link = Profile::zrl($profile_link); $profile_link = Profile::zrl($profile_link);
} }
if (!isset($item['author-thumb']) || ($item['author-thumb'] == "")) { if (($item['network'] == NETWORK_FEED) || empty($item['author-thumb'])) {
$author_contact = Contact::getDetailsByURL($item['author-link'], $conv->getProfileOwner()); $item['author-thumb'] = $item['author-avatar'];
if ($author_contact["thumb"]) {
$item['author-thumb'] = $author_contact["thumb"];
} else {
$item['author-thumb'] = $item['author-avatar'];
}
} }
if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) { if (($item['network'] == NETWORK_FEED) || empty($item['owner-thumb'])) {
$owner_contact = Contact::getDetailsByURL($item['owner-link'], $conv->getProfileOwner()); $item['owner-thumb'] = $item['owner-avatar'];
if ($owner_contact["thumb"]) {
$item['owner-thumb'] = $owner_contact["thumb"];
} else {
$item['owner-thumb'] = $item['owner-avatar'];
}
} }
$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => '']; $locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];