Merge pull request #7570 from nupplaphil/bug/friendica-7298

[friendica.git] / src / Protocol / ActivityPub / Processor.php

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 65dd6d3e627e98d32978651a650c3f4c98d02681..7639d0f2a325d97ee6dc3ea6a9f2fb48a4f0d6b4 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -419,8 +419,8 @@ class Processor
                                $item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
                        }
 
-                       if (empty($item['contact-id'])) {
-                               $item['contact-id'] = $item['author-id'];
+                       if (($receiver != 0) && empty($item['contact-id'])) {
+                               $item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true);
                        }
 
                        if (!empty($activity['directmessage'])) {