Merge pull request #5006 from annando/fix-empty-avatar

Bugfix: Avoid empty avatar photos when a public contact is created

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 44275ae44c3ac24b20be43e04e17b6a1b3da6609..b67ad8da401bdeb71a7b78ac706b88a5f95595a1 100644 (file)
--- 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));
 

diff --git a/update.php b/update.php
index 1a6bcdf7b24b7e0d1681935f69c7a4d9c0ebdf71..e85641007dad61f5d1cb29bfd47fe56ab7d28ab0 100644 (file)
--- 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;