aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-11-21 17:36:01 -0800
committerFriendika <info@friendika.com>2010-11-21 17:36:01 -0800
commit72fd6eec4b3722aa8cb44f76dae9b8737f732287 (patch)
tree483fba1245822351e0f6ed1687bcedbf44aa9d21 /mod
parent6a3815e751b013d2fba1e1de6df89566f971e39c (diff)
downloadvolse-hubzilla-72fd6eec4b3722aa8cb44f76dae9b8737f732287.tar.gz
volse-hubzilla-72fd6eec4b3722aa8cb44f76dae9b8737f732287.tar.bz2
volse-hubzilla-72fd6eec4b3722aa8cb44f76dae9b8737f732287.zip
make sure to use local avatar if we have one
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php
index 59fd12c4b..979a7b916 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -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;