aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-11-21 17:44:59 -0800
committerFriendika <info@friendika.com>2010-11-21 17:44:59 -0800
commit09117b1dc7a64a8a85a81fc8f6e38f7cadb274bf (patch)
tree8b59c4f9041bdf1fff81f687d45ad93ddca77468
parent83e3cc34d2ab50d956d7fb27ddd7f96e82592123 (diff)
downloadvolse-hubzilla-09117b1dc7a64a8a85a81fc8f6e38f7cadb274bf.tar.gz
volse-hubzilla-09117b1dc7a64a8a85a81fc8f6e38f7cadb274bf.tar.bz2
volse-hubzilla-09117b1dc7a64a8a85a81fc8f6e38f7cadb274bf.zip
she'll be right
-rw-r--r--mod/display.php7
-rw-r--r--mod/network.php9
2 files changed, 10 insertions, 6 deletions
diff --git a/mod/display.php b/mod/display.php
index e9d1bbbb1..af121abdb 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -211,8 +211,11 @@ function display_content(&$a) {
}
}
- $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
- $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+ $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+
+ $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;
if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
diff --git a/mod/network.php b/mod/network.php
index fb4a35984..6e781f4fa 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -239,10 +239,11 @@ function network_content(&$a, $update = 0) {
// Post was remotely authored.
-// 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);
-// }
+ $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+
+ $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;