Bugfix: Avatar pictures of mail contacts weren't displayed correctly

diff --git a/include/conversation.php b/include/conversation.php
index 86b5ddc8d20b4e667e0ed2fad4412d364e12b291..0340ad3e4a8c8e74f3cde7f8cbcd843fef63c052 100644 (file)
--- 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 e6d6bd45f542b46ae1ad4b4535aa1e0d2416a22a..ee40d186ce23a5d0578a790cec0e739b2068bf67 100644 (file)
--- 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"];