propagate remote deletes

diff --git a/include/items.php b/include/items.php
index b90b5434ff1dc0be792c8171f56aa8b792a5e782..7578bf155a0e828de370d5a9ff2af063d51133d1 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -2148,18 +2148,19 @@ function local_delivery($importer,$data) {
                        }
                        if($deleted) {
 
+                               // check for relayed deletes to our conversation
 
                                $is_reply = false;              
-                               $r = q("select * from item where uri = '%s' and id = parent limit 1",
-                                       dbesc($uri)
+                               $r = q("select * from item where uri = '%s' and uid = %d limit 1",
+                                       dbesc($uri),
+                                       intval($importer['importer_uid'])
                                );
                                if(count($r)) {
                                        $parent_uri = $r[0]['parent-uri'];
-                                       if($r[0]['parent-uri'] != $uri && $r[0]['thr-parent'] != $uri)
+                                       if($r[0]['id'] != $r[0]['parent'])
                                                $is_reply = true;
                                }                               
 
-
                                if($is_reply) {
                                        $community = false;
 
@@ -2295,8 +2296,10 @@ function local_delivery($importer,$data) {
                                                                );
                                                        }       
                                                }
+                                               // if this is a relayed delete, propagate it to other recipients
+
                                                if($is_a_remote_delete)
-                                                       proc_run('php',"include/notifier.php","delete",$item['id']);
+                                                       proc_run('php',"include/notifier.php","drop",$item['id']);
                                        }
                                }
                        }