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

make sure to use local avatar if we have one

Browse source
This commit is contained in:
Friendika 2010-11-21 17:36:01 -08:00
parent 6a3815e751
commit 72fd6eec4b
2 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/network.php
View file

@ -156,7 +156,9 @@ function network_content(&$a, $update = 0) {
$template = $tpl;
$commentww = '';
$owner_url = $owner_photo = $owner_name = '';
$profile_url = $item['url'];
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
@ -237,8 +239,10 @@ function network_content(&$a, $update = 0) {
// Post was remotely authored.
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $thumb);
if((x($item,'author-link')) && ($item['url'] !== $item['author-link'])) {
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $thumb);
}
$profile_link = $profile_url;