nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki 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
parent f2a993abd9 1f1697222b
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

8
src/Protocol/DFRN.php
View file

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

18
src/Worker/Delivery.php
View file

@ -296,13 +296,17 @@ class Delivery
$msgitems = [$target_item];
$atom = DFRN::entries($msgitems, $owner);
} else {
$msgitems = [];
foreach ($items as $item) {
// Only add the parent when we don't delete other items.
if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
$item["entry:comment-allow"] = true;
$item["entry:cid"] = ($top_level ? $contact['id'] : 0);
$msgitems[] = $item;
if ($target_item['deleted']) {
$msgitems = [$target_item];
} else {
$msgitems = [];
foreach ($items as $item) {
// Only add the parent when we don't delete other items.
if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
$item["entry:comment-allow"] = true;
$item["entry:cid"] = ($top_level ? $contact['id'] : 0);
$msgitems[] = $item;
}
}
}
$atom = DFRN::entries($msgitems, $owner);