diff options
| author | friendica <info@friendica.com> | 2012-10-27 03:05:51 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-10-27 03:05:51 -0700 |
| commit | 0baf4bb4d23e7f44acd5d426ea79519105c6c304 (patch) | |
| tree | b6338d1d8070dc3ace763cf13b14e89d6979d203 /include | |
| parent | 5b1a15704b81af507bddb623fefa3a9f416050b4 (diff) | |
| download | volse-hubzilla-0baf4bb4d23e7f44acd5d426ea79519105c6c304.tar.gz volse-hubzilla-0baf4bb4d23e7f44acd5d426ea79519105c6c304.tar.bz2 volse-hubzilla-0baf4bb4d23e7f44acd5d426ea79519105c6c304.zip | |
fix a couple of things that went wonky when moving to thread objects
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 6142d6a4d..e85461682 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -121,13 +121,17 @@ class Item extends BaseObject { $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); - if($item['author-link'] && (! $item['author-name'])) - $profile_name = $item['author-link']; + + $profile_avatar = $item['author']['xchan_photo_m']; + $profile_link = zrl($item['author']['xchan_profile']); + $profile_name = $item['author']['xchan_name']; + +// if($item['author-link'] && (! $item['author-name'])) +// $profile_name = $item['author-link']; $sp = false; - $profile_link = best_link_url($item,$sp); - if($profile_link === 'mailbox') - $profile_link = ''; +// $profile_link = best_link_url($item,$sp); + if($sp) $sparkle = ' sparkle'; else @@ -136,11 +140,11 @@ class Item extends BaseObject { $profile_link = zrl($item['author']['xchan_profile']); - $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); - if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) - $profile_avatar = $a->contacts[$normalised]['thumb']; - else - $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($this->get_data_value('thumb'))); +// $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); +// if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) +// $profile_avatar = $a->contacts[$normalised]['thumb']; +// else +// $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($this->get_data_value('thumb'))); $profile_avatar = $item['author']['xchan_photo_m']; |