clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2673 from annando/1607-mail-avatar 

Bugfix: Avatar pictures of mail contacts weren't displayed correctly
This commit is contained in:
rabuzarus 2016-07-11 21:41:23 +02:00 committed by GitHub
parent 2a088d27d0 0a46a3d10e
commit 566f237f4a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/conversation.php
View File

@ -676,7 +676,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
else else
$profile_link = zrl($profile_link); $profile_link = zrl($profile_link);
if (!isset($item['author-thumb'])) { if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) {
$author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
if ($author_contact["thumb"]) if ($author_contact["thumb"])
$item['author-thumb'] = $author_contact["thumb"]; $item['author-thumb'] = $author_contact["thumb"];
@ -684,7 +684,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$item['author-thumb'] = $item['author-avatar']; $item['author-thumb'] = $item['author-avatar'];
} }
if (!isset($item['owner-thumb'])) { if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
$owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner);
if ($owner_contact["thumb"]) if ($owner_contact["thumb"])
$item['owner-thumb'] = $owner_contact["thumb"]; $item['owner-thumb'] = $owner_contact["thumb"];

4
object/Item.php
View File

@ -150,7 +150,7 @@ class Item extends BaseObject {
else else
$profile_link = zrl($profile_link); $profile_link = zrl($profile_link);
if (!isset($item['author-thumb'])) { if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) {
$author_contact = get_contact_details_by_url($item['author-link'], $conv->get_profile_owner()); $author_contact = get_contact_details_by_url($item['author-link'], $conv->get_profile_owner());
if ($author_contact["thumb"]) if ($author_contact["thumb"])
$item['author-thumb'] = $author_contact["thumb"]; $item['author-thumb'] = $author_contact["thumb"];
@ -158,7 +158,7 @@ class Item extends BaseObject {
$item['author-thumb'] = $item['author-avatar']; $item['author-thumb'] = $item['author-avatar'];
} }
if (!isset($item['owner-thumb'])) { if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
$owner_contact = get_contact_details_by_url($item['owner-link'], $conv->get_profile_owner()); $owner_contact = get_contact_details_by_url($item['owner-link'], $conv->get_profile_owner());
if ($owner_contact["thumb"]) if ($owner_contact["thumb"])
$item['owner-thumb'] = $owner_contact["thumb"]; $item['owner-thumb'] = $owner_contact["thumb"];