Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 22:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more places changed to the new contact avatar path format

Browse source
This commit is contained in:
Michael 2021-06-30 16:58:46 +00:00
parent 4308cace68
commit 09aa496387
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Object/Post.php
View file

@ -69,7 +69,6 @@ class Post
private $thread = null;
private $redirect_url = null;
private $owner_url = '';
private $owner_photo = '';
private $owner_name = '';
private $wall_to_wall = false;
private $threaded = false;
@ -474,7 +473,7 @@ class Post
'shiny' => $shiny,
'owner_self' => $item['author-link'] == Session::get('my_url'),
'owner_url' => $this->getOwnerUrl(),
'owner_photo' => DI::baseUrl()->remove($item['owner-avatar']),
'owner_photo' => DI::baseUrl()->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)),
'owner_name' => $this->getOwnerName(),
'plink' => Item::getPlink($item),
'edpost' => $edpost,
@ -1007,7 +1006,6 @@ class Post
// Put this person as the wall owner of the wall-to-wall notice.
$this->owner_url = Contact::magicLinkByContact($a->page_contact);
$this->owner_photo = $a->page_contact['thumb'];
$this->owner_name = $a->page_contact['name'];
$this->wall_to_wall = true;
} elseif ($this->getDataValue('owner-link')) {
@ -1025,7 +1023,6 @@ class Post
// But it could be somebody else with the same name. It just isn't highly likely.
$this->owner_photo = $this->getDataValue('owner-avatar');
$this->owner_name = $this->getDataValue('owner-name');
$this->wall_to_wall = true;
@ -1041,7 +1038,6 @@ class Post
if (!$this->wall_to_wall) {
$this->setTemplate('wall');
$this->owner_url = '';
$this->owner_photo = '';
$this->owner_name = '';
}
}