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

AP: Fix a notice / avoid an error when fetched content hadn't been an array

This commit is contained in:
Michael 2018-10-18 05:54:44 +00:00
parent da2a17495d
commit 8035bad8e2
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);