Merge pull request #6223 from intentionally-left-nil/fix-update-no-shared-inbox

Fix null dereference error when updating the sharedInbox
2 weeks ago · 59cccb1a25
parent f2e4715749 2f6c6830ea
commit 59cccb1a25
1 changed files with 3 additions and 2 deletions
--- a/app/Jobs/ProfilePipeline/HandleUpdateActivity.php
+++ b/app/Jobs/ProfilePipeline/HandleUpdateActivity.php
@ -47,8 +47,9 @@ class HandleUpdateActivity implements ShouldQueue
            return;
        }

-        if ($profile->sharedInbox == null || $profile->sharedInbox != $payload['object']['endpoints']['sharedInbox']) {
-            $profile->sharedInbox = $payload['object']['endpoints']['sharedInbox'];
+        $sharedInbox = isset($payload['object']['endpoints']['sharedInbox']) ? $payload['object']['endpoints']['sharedInbox'] : null;
+        if ($profile->sharedInbox !== $sharedInbox) {
+            $profile->sharedInbox = $sharedInbox;
        }

        if ($profile->public_key !== $payload['object']['publicKey']['publicKeyPem']) {