1
0
Fork 0

she'll be right

This commit is contained in:
Friendika 2010-11-21 17:44:59 -08:00
parent 83e3cc34d2
commit 09117b1dc7
2 changed files with 10 additions and 6 deletions

View file

@ -211,8 +211,11 @@ function display_content(&$a) {
} }
} }
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
$profile_link = $profile_url; $profile_link = $profile_url;
if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))

View file

@ -239,10 +239,11 @@ function network_content(&$a, $update = 0) {
// Post was remotely authored. // Post was remotely authored.
// if((x($item,'author-link')) && ($item['url'] !== $item['author-link'])) { $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $thumb); $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
// } $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
$profile_link = $profile_url; $profile_link = $profile_url;