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

Expect outbox->first to be a Link structure in Model\GContact

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 21225cb23c0addcb7f3c8b9d89e4875e4529ab57..2402d6b519d122e1a09e37dc1bbd7e5ca76dd3b4 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -859,7 +859,9 @@ class GContact
        /**
         * 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)
        {
@@ -872,6 +874,9 @@ class GContact
                        $items = $outbox['orderedItems'];
                } elseif (!empty($outbox['first']['orderedItems'])) {
                        $items = $outbox['first']['orderedItems'];
+               } elseif (!empty($outbox['first']['href'])) {
+                       self::updateFromOutbox($outbox['first']['href'], $data);
+                       return;
                } elseif (!empty($outbox['first'])) {
                        self::updateFromOutbox($outbox['first'], $data);
                        return;