clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects 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
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Worker/Delivery.php
+11 -7
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);