From 0a46a3d10ef705ab5272842d2b9215a9f638e648 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 11 Jul 2016 20:42:18 +0200
Subject: [PATCH] Bugfix: Avatar pictures of mail contacts weren't displayed
correctly
---
include/conversation.php | 4 ++--
object/Item.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/conversation.php b/include/conversation.php
index 86b5ddc8d2..0340ad3e4a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -676,7 +676,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
else
$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);
if ($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'];
}
- 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);
if ($owner_contact["thumb"])
$item['owner-thumb'] = $owner_contact["thumb"];
diff --git a/object/Item.php b/object/Item.php
index e6d6bd45f5..ee40d186ce 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -150,7 +150,7 @@ class Item extends BaseObject {
else
$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());
if ($author_contact["thumb"])
$item['author-thumb'] = $author_contact["thumb"];
@@ -158,7 +158,7 @@ class Item extends BaseObject {
$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());
if ($owner_contact["thumb"])
$item['owner-thumb'] = $owner_contact["thumb"];