clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7767 from MrPetovan/bug/fatal-errors 

Expect outbox->first to be a Link structure in Model\GContact
This commit is contained in:
Philipp 2019-10-25 08:46:42 +02:00 committed by GitHub
parent 73b448c829 b0987f637c
commit b34afa990b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Model/GContact.php
View File

@ -859,7 +859,9 @@ class GContact
/** /**
* Update a global contact via an ActivityPub Outbox * Update a global contact via an ActivityPub Outbox
* *
* @param string $data Probing result * @param string $feed
* @param array $data Probing result
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private static function updateFromOutbox(string $feed, array $data) private static function updateFromOutbox(string $feed, array $data)
{ {
@ -872,6 +874,9 @@ class GContact
$items = $outbox['orderedItems']; $items = $outbox['orderedItems'];
} elseif (!empty($outbox['first']['orderedItems'])) { } elseif (!empty($outbox['first']['orderedItems'])) {
$items = $outbox['first']['orderedItems']; $items = $outbox['first']['orderedItems'];
} elseif (!empty($outbox['first']['href'])) {
self::updateFromOutbox($outbox['first']['href'], $data);
return;
} elseif (!empty($outbox['first'])) { } elseif (!empty($outbox['first'])) {
self::updateFromOutbox($outbox['first'], $data); self::updateFromOutbox($outbox['first'], $data);
return; return;