bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

The uri-id is now in all contact tables

Browse source
This commit is contained in:
Michael 2021-07-09 07:09:33 +00:00
commit 6e79da0b0c
7 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Contact.php
View file

@ -185,11 +185,7 @@ class Contact
$fields['gsid'] = GServer::getID($fields['baseurl'], true);
}
if (!empty($fields['url']) && !empty($fields['guid'])) {
$fields['uri-id'] = ItemURI::insert(['uri' => $fields['url'], 'guid' => $fields['guid']]);
} elseif (!empty($fields['url'])) {
$fields['uri-id'] = ItemURI::getIdByURI($fields['url']);
}
$fields['uri-id'] = ItemURI::getIdByURI($fields['url']);
if (empty($fields['created'])) {
$fields['created'] = DateTimeFormat::utcNow();
@ -2161,7 +2157,7 @@ class Contact
if (empty($guid)) {
$ret['uri-id'] = ItemURI::getIdByURI($ret['url']);
} else {
$ret['uri-id'] = ItemURI::insert(['uri' => $ret['uri'], 'guid' => $guid]);
$ret['uri-id'] = ItemURI::insert(['uri' => $ret['uri'], 'guid' => $guid]);
}
$ret['nurl'] = Strings::normaliseLink($ret['url']);