Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4524 from annando/delete-dfrn

Browse source 
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
parent 1693633e05 2f121aa828
commit b088ef83c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Worker/Delivery.php
View file

@ -242,7 +242,8 @@ class Delivery {
} }
if ($normal_mode) { 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:comment-allow"] = true;
$item["entry:cid"] = (($top_level) ? $contact['id'] : 0); $item["entry:cid"] = (($top_level) ? $contact['id'] : 0);
$msgitems[] = $item; $msgitems[] = $item;