From 3eb0b795fcefbb3e802baca787b5fc461b6ac2ea Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 9 May 2018 06:53:57 +0000 Subject: [PATCH 1/2] Bugfix: Avoid empty avatar photos when a public contact is created --- src/Model/Item.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 44275ae44c..b67ad8da40 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -489,7 +489,7 @@ class Item extends BaseObject $item["contact-id"] = self::contactId($item); $default = ['url' => $item['author-link'], 'name' => $item['author-name'], - 'avatar' => $item['author-avatar'], 'network' => $item['network']]; + 'photo' => $item['author-avatar'], 'network' => $item['network']]; $item['author-id'] = defaults($item, 'author-id', Contact::getIdForURL($item["author-link"], 0, false, $default)); @@ -499,7 +499,7 @@ class Item extends BaseObject } $default = ['url' => $item['owner-link'], 'name' => $item['owner-name'], - 'avatar' => $item['owner-avatar'], 'network' => $item['network']]; + 'photo' => $item['owner-avatar'], 'network' => $item['network']]; $item['owner-id'] = defaults($item, 'owner-id', Contact::getIdForURL($item["owner-link"], 0, false, $default)); From df96d81a0ef22e7a4a6844317c83f53da52e58e0 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 9 May 2018 07:09:47 +0000 Subject: [PATCH 2/2] Ensure avatar photo in update routine --- update.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.php b/update.php index 1a6bcdf7b2..e85641007d 100644 --- a/update.php +++ b/update.php @@ -196,7 +196,7 @@ function update_1260() { WHERE `owner-id` = 0 AND `owner-link` != ''"); while ($item = dba::fetch($items)) { $contact = ['url' => $item['owner-link'], 'name' => $item['owner-name'], - 'avatar' => $item['owner-avatar'], 'network' => $item['network']]; + 'photo' => $item['owner-avatar'], 'network' => $item['network']]; $cid = Contact::getIdForURL($item['owner-link'], 0, false, $contact); if (empty($cid)) { continue; @@ -212,7 +212,7 @@ function update_1260() { WHERE `author-id` = 0 AND `author-link` != ''"); while ($item = dba::fetch($items)) { $contact = ['url' => $item['author-link'], 'name' => $item['author-name'], - 'avatar' => $item['author-avatar'], 'network' => $item['network']]; + 'photo' => $item['author-avatar'], 'network' => $item['network']]; $cid = Contact::getIdForURL($item['author-link'], 0, false, $contact); if (empty($cid)) { continue;