friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix notice "undefined index: uri"

This commit is contained in:
Michael 2021-07-09 14:52:22 +00:00
parent 6354d7c81d
commit 0735a22cdd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/APContact.php
View File

@ -124,7 +124,7 @@ class APContact
$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]); $apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
} }
if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update) && !empty($apcontact['pubkey'])) { if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update) && !empty($apcontact['pubkey']) && !empty($apcontact['uri-id'])) {
return $apcontact; return $apcontact;
} }
@ -352,7 +352,7 @@ class APContact
if (empty($apcontact['uuid'])) { if (empty($apcontact['uuid'])) {
$apcontact['uri-id'] = ItemURI::getIdByURI($apcontact['url']); $apcontact['uri-id'] = ItemURI::getIdByURI($apcontact['url']);
} else { } else {
$apcontact['uri-id'] = ItemURI::insert(['uri' => $apcontact['uri'], 'guid' => $apcontact['uuid']]); $apcontact['uri-id'] = ItemURI::insert(['uri' => $apcontact['url'], 'guid' => $apcontact['uuid']]);
} }
$apcontact['updated'] = DateTimeFormat::utcNow(); $apcontact['updated'] = DateTimeFormat::utcNow();

6
src/Model/Contact.php
View File

@ -1072,12 +1072,12 @@ class Contact
return 0; return 0;
} }
$contact = self::getByURL($url, false, ['id', 'network'], $uid); $contact = self::getByURL($url, false, ['id', 'network', 'uri-id'], $uid);
if (!empty($contact)) { if (!empty($contact)) {
$contact_id = $contact["id"]; $contact_id = $contact["id"];
if (empty($update)) { if (empty($update) && (!empty($contact['uri-id']) || is_bool($update))) {
Logger::debug('Contact found', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]); Logger::debug('Contact found', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
return $contact_id; return $contact_id;
} }
@ -2157,7 +2157,7 @@ class Contact
if (empty($guid)) { if (empty($guid)) {
$ret['uri-id'] = ItemURI::getIdByURI($ret['url']); $ret['uri-id'] = ItemURI::getIdByURI($ret['url']);
} else { } else {
$ret['uri-id'] = ItemURI::insert(['uri' => $ret['uri'], 'guid' => $guid]); $ret['uri-id'] = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
} }
$ret['nurl'] = Strings::normaliseLink($ret['url']); $ret['nurl'] = Strings::normaliseLink($ret['url']);