From b685ef37c9bc324fe3b2313d33288b0d830343dd Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 23 Jul 2018 07:48:44 -0400 Subject: [PATCH] Fix Fatal errors in Protocol\OStatus (#5466) --- src/Protocol/OStatus.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index a443f65cef..02b9664d5a 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -288,7 +288,7 @@ class OStatus * @param string $hub Called by reference, returns the fetched hub data * @return void */ - public static function import($xml, array $importer, array &$contact, &$hub) + public static function import($xml, array $importer, array &$contact = null, &$hub) { self::process($xml, $importer, $contact, $hub); } @@ -1704,6 +1704,10 @@ class OStatus $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]); + if (!$parent) { + $parent = []; + } + XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent)); self::entryContent($doc, $as_object, $parent, $owner, "New entry");