From: friendica <info@friendica.com>
Date: Mon, 23 Apr 2012 02:19:02 +0000 (-0700)
Subject: bug #388 - notify_comment received after post deleted
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2170df897b9dc72b87cc104520f6a67ddfbb994f;p=friendica.git

bug #388 - notify_comment received after post deleted
---

diff --git a/include/diaspora.php b/include/diaspora.php
index 06df9c24a4..afd86957b8 100644
--- 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 0a8bc12c08..07f62ece57 100644
--- 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'])
 					);