Merge pull request #4524 from annando/delete-dfrn

When deleting, don't send the parent via DFRN
This commit is contained in:
Hypolite Petovan 2018-03-01 15:52:51 -05:00 committed by GitHub
commit b088ef83c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -242,7 +242,8 @@ class Delivery {
}
if ($normal_mode) {
if ($item_id == $item['id'] || $item['id'] == $item['parent']) {
// Only add the parent when we don't delete other items.
if ($item_id == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != 'drop'))) {
$item["entry:comment-allow"] = true;
$item["entry:cid"] = (($top_level) ? $contact['id'] : 0);
$msgitems[] = $item;