keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10320 from annando/notice

Browse source 
Avoid notices because of empty fields
This commit is contained in:
Tobias Diekershoff 2021-05-25 15:25:51 +02:00 committed by GitHub
commit 91b474ea6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/APContact.php
View file

@ -361,7 +361,7 @@ class APContact
Logger::info('Updated profile', ['url' => $url]);
return $apcontact;
return DBA::selectFirst('apcontact', [], ['url' => $apcontact['url']]) ?: [];
}
/**

5
src/Util/HTTPSignature.php
View file

@ -640,16 +640,17 @@ class HTTPSignature
$profile = APContact::getByURL($url);
if (!empty($profile)) {
Logger::log('Taking key from id ' . $id, Logger::DEBUG);
Logger::info('Taking key from id', ['id' => $id]);
return ['url' => $url, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']];
} elseif ($url != $actor) {
$profile = APContact::getByURL($actor);
if (!empty($profile)) {
Logger::log('Taking key from actor ' . $actor, Logger::DEBUG);
Logger::info('Taking key from actor', ['actor' => $actor]);
return ['url' => $actor, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']];
}
}
Logger::notice('Key could not be fetched', ['url' => $url, 'actor' => $actor]);
return false;
}
}