X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=9d609786e96a1880ec0c63d0ab31f29fdc587be6;hb=6b93becf7b57f9766cb15f95377f27b3473ffeb8;hp=1bd57d8561bce8533352dbb942eac87d0405e161;hpb=bbda69a736de66d689f449604e8643f7e755865f;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 1bd57d8561..9d609786e9 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1668,8 +1668,8 @@ class Contact */ public static function getDefaultHeader(array $contact): string { - if (!empty($contact['header']) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::TWITTER])) { - return DI::baseUrl() . '/images/blank.png'; + if (!empty($contact['header'])) { + return $contact['header']; } if (!empty($contact['gsid'])) { @@ -1702,7 +1702,7 @@ class Contact break; default: /** - * Use random pictures for networks that don't provide banners. + * Use a random picture. * The service provides random pictures from Unsplash. * @license https://unsplash.com/license */ @@ -2159,7 +2159,7 @@ class Contact // These fields aren't updated by this routine: // 'sensitive' - $fields = ['uid', 'uri-id', 'gsid', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe', + $fields = ['uid', 'uri-id', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe', 'manually-approve', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item', 'xmpp', 'matrix']; $contact = DBA::selectFirst('contact', $fields, ['id' => $id]); @@ -2191,9 +2191,6 @@ class Contact $uriid = $contact['uri-id']; unset($contact['uri-id']); - $gsid = $contact['gsid']; - unset($contact['gsid']); - $pubkey = $contact['pubkey']; unset($contact['pubkey']);