Merge pull request #8462 from annando/issue-8254-3

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 96b8447b4ccedc5e38031cc2a373f355c91a09a9..bf3a6ef9d597021227c21bd57b6096dbd592c842 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -247,7 +247,7 @@ class OStatus
                        $gcid = GContact::update($contact);
 
                        GContact::link($gcid, $contact["uid"], $contact["id"]);
-               } elseif ($contact["network"] != Protocol::DFRN) {
+               } elseif (empty($contact["network"]) || ($contact["network"] != Protocol::DFRN)) {
                        $contact = [];
                }
 
@@ -585,7 +585,7 @@ class OStatus
                        return;
                }
 
-               Item::delete($condition);
+               Item::markForDeletion($condition);
 
                Logger::log('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
        }