mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into nodeinfo

Browse source
This commit is contained in:
Michael 2019-11-27 08:18:03 +00:00
parent cb37588375 faa63632bf
commit 98d10b7253
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Model/GContact.php
View file

@ -627,10 +627,11 @@ class GContact
$contact['about'] = $contact['about'] ?? ''; $contact['about'] = $contact['about'] ?? '';
$contact['generation'] = $contact['generation'] ?? 0; $contact['generation'] = $contact['generation'] ?? 0;
$fields = ['name' => $contact['name'], 'nick' => $contact['nick'], 'addr' => $contact['addr'], 'network' => $contact['network'], $fields = ['name' => $contact['name'], 'nick' => $contact['nick'] ?? '', 'addr' => $contact['addr'] ?? '', 'network' => $contact['network'],
'url' => $contact['url'], 'nurl' => Strings::normaliseLink($contact['url']), 'photo' => $contact['photo'], 'url' => $contact['url'], 'nurl' => Strings::normaliseLink($contact['url']), 'photo' => $contact['photo'],
'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), 'location' => $contact['location'], 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), 'location' => $contact['location'],
'about' => $contact['about'], 'hide' => $contact['hide'], 'generation' => $contact['generation']]; 'about' => $contact['about'], 'hide' => $contact['hide'], 'generation' => $contact['generation']];
DBA::insert('gcontact', $fields); DBA::insert('gcontact', $fields);
$condition = ['nurl' => Strings::normaliseLink($contact['url'])]; $condition = ['nurl' => Strings::normaliseLink($contact['url'])];