Merge pull request #5013 from annando/feed-avatar
For feed items show the avatar of the local user
This commit is contained in:
commit
8612e44d19
1 changed files with 4 additions and 14 deletions
|
@ -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' => ''];
|
||||||
|
|
Loading…
Reference in a new issue