bug #388 - notify_comment received after post deleted

diff --git a/include/diaspora.php b/include/diaspora.php
index 06df9c24a4513d2ddc27cd5de1c13a8e54a67db6..afd86957b8fff92f7332a3546321316464906f46 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1172,7 +1172,7 @@ function diaspora_comment($importer,$xml,$msg) {
                proc_run('php','include/notifier.php','comment',$message_id);
        }
 
-       $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+       $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ",
                dbesc($parent_item['uri']),
                intval($importer['uid'])
        );

diff --git a/include/items.php b/include/items.php
index 0a8bc12c0893911e9e414acfb1d993949f8861b3..07f62ece575970f81f6fc7000be2f4cc285e1e47 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2479,7 +2479,7 @@ function local_delivery($importer,$data) {
                        
                                if(!x($datarray['type']) || $datarray['type'] != 'activity') {
 
-                                       $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+                                       $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
                                                dbesc($parent_uri),
                                                intval($importer['importer_uid'])
                                        );