more improvements on sparkle links bug #13

This commit is contained in:
Friendika 2011-03-06 19:43:03 -08:00
parent 7f1f18675c
commit 26c4054652

View file

@ -233,7 +233,7 @@ function network_content(&$a, $update = 0) {
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) { if(strlen($item['author-link'])) {
if(($item['network'] === 'dfrn') && (! $item['self'])) { if(($item['network'] === 'dfrn') && (! $item['self'])) {
$profile_link = $redirect_url; $profile_link = $redirect_url;
$sparkle = ' sparkle'; $sparkle = ' sparkle';
@ -242,7 +242,6 @@ function network_content(&$a, $update = 0) {
$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']]; $profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
$sparkle = ' sparkle'; $sparkle = ' sparkle';
} }
} }
$location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''); $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
@ -380,7 +379,8 @@ function network_content(&$a, $update = 0) {
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $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_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) { if(strlen($item['author-link'])) {
$profile_link = $item['author-link'];
if(($item['network'] === 'dfrn') && (! $item['self'])) { if(($item['network'] === 'dfrn') && (! $item['self'])) {
$profile_link = $redirect_url; $profile_link = $redirect_url;
$sparkle = ' sparkle'; $sparkle = ' sparkle';
@ -389,8 +389,6 @@ function network_content(&$a, $update = 0) {
$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']]; $profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
$sparkle = ' sparkle'; $sparkle = ' sparkle';
} }
else
$profile_link = $item['author-link'];
} }
else else
$profile_link = $item['url']; $profile_link = $item['url'];