bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #9628 from annando/dfrn-delete

Browse source 
Don't create the parent during a deletion
This commit is contained in:
Hypolite Petovan 2020-12-06 08:37:50 -05:00 committed by GitHub
commit a863228e09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/DFRN.php
View file

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

4
src/Worker/Delivery.php
View file

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