Merge pull request #9628 from annando/dfrn-delete

Don't create the parent during a deletion

src/Protocol/DFRN.php

@@ -2705,9 +2705,13 @@ class DFRN
 		}
 
 		$deletions = $xpath->query("/atom:feed/at:deleted-entry");
+		if (!empty($deletions)) {
 			foreach ($deletions as $deletion) {
 				self::processDeletion($xpath, $deletion, $importer);
 			}
+			Logger::notice('Deletions had been processed');
+			return 200;
+		}
 
 		if (!$sort_by_date) {
 			$entries = $xpath->query("/atom:feed/atom:entry");

src/Worker/Delivery.php

@@ -295,6 +295,9 @@ class Delivery
 		} elseif ($followup) {
 			$msgitems = [$target_item];
 			$atom = DFRN::entries($msgitems, $owner);
+		} else {
+			if ($target_item['deleted']) {
+				$msgitems = [$target_item];
 			} else {
 				$msgitems = [];
 				foreach ($items as $item) {
@@ -305,6 +308,7 @@ class Delivery
 						$msgitems[] = $item;
 					}
 				}
+			}
 			$atom = DFRN::entries($msgitems, $owner);
 		}