https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1693633
)
When deleting, don't send the parent via DFRN
author
Michael
<heluecht@pirati.ca>
Thu, 1 Mar 2018 20:44:44 +0000
(20:44 +0000)
committer
Michael
<heluecht@pirati.ca>
Thu, 1 Mar 2018 20:44:44 +0000
(20:44 +0000)
src/Worker/Delivery.php
patch
|
blob
|
history
diff --git
a/src/Worker/Delivery.php
b/src/Worker/Delivery.php
index
b8eceb0
..
fe6fad6
100644
(file)
--- a/
src/Worker/Delivery.php
+++ b/
src/Worker/Delivery.php
@@
-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;