nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5952 from annando/ap-fixes

Browse source 
AP: Fix a notice / avoid an error when fetched content hadn't been an array
This commit is contained in:
Tobias Diekershoff 2018-10-18 08:02:27 +02:00 committed by GitHub
parent da2a17495d 8035bad8e2
commit e2f005f68c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Protocol/ActivityPub.php
View file

@ -63,7 +63,13 @@ class ActivityPub
return false; return false;
} }
return json_decode($curlResult->getBody(), true); $content = json_decode($curlResult->getBody(), true);
if (empty($content) || !is_array($content)) {
return false;
}
return $content;
} }
/** /**

2
src/Protocol/ActivityPub/Processor.php
View file

@ -272,7 +272,7 @@ class Processor
$activity['cc'] = defaults($object, 'cc', []); $activity['cc'] = defaults($object, 'cc', []);
$activity['actor'] = $child['author']; $activity['actor'] = $child['author'];
$activity['object'] = $object; $activity['object'] = $object;
$activity['published'] = $object['published']; $activity['published'] = defaults($object, 'published', $child['published']);
$activity['type'] = 'Create'; $activity['type'] = 'Create';
$ldactivity = JsonLD::compact($activity); $ldactivity = JsonLD::compact($activity);