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

Merge pull request #12147 from annando/warning

Browse source 
Fix warning:  Undefined array key "public"
This commit is contained in:
Philipp 2022-11-09 09:25:01 +01:00 committed by GitHub
commit 55365aa4da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Factory/Api/Mastodon/Relationship.php
View file

@ -39,12 +39,13 @@ class Relationship extends BaseFactory
{ {
$cdata = Contact::getPublicAndUserContactID($contactId, $uid); $cdata = Contact::getPublicAndUserContactID($contactId, $uid);
if (!empty($cdata)) { if (!empty($cdata)) {
$cid = $cdata['user']; $cid = $cdata['user'];
$pcid = $cdata['public'];
} else { } else {
$cid = $contactId; $pcid = $cid = $contactId;
} }
return new RelationshipEntity($cdata['public'], Contact::getById($cid), return new RelationshipEntity($pcid, Contact::getById($cid),
Contact\User::isBlocked($cid, $uid), Contact\User::isIgnored($cid, $uid)); Contact\User::isBlocked($cid, $uid), Contact\User::isIgnored($cid, $uid));
} }
} }

2
src/Worker/CheckRelMeProfileLink.php
View file

@ -67,7 +67,7 @@ class CheckRelMeProfileLink
Logger::notice('Empty body of the fetched homepage link). Cannot verify the relation to profile of UID %s.', ['uid' => $uid, 'owner homepage' => $owner['homepage']]); Logger::notice('Empty body of the fetched homepage link). Cannot verify the relation to profile of UID %s.', ['uid' => $uid, 'owner homepage' => $owner['homepage']]);
} else { } else {
$doc = new DOMDocument(); $doc = new DOMDocument();
$doc->loadHTML($content); @$doc->loadHTML($content);
if (!$doc) { if (!$doc) {
Logger::notice('Could not parse the content'); Logger::notice('Could not parse the content');
} else { } else {