diff options
| author | friendica <info@friendica.com> | 2012-04-22 19:19:02 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-04-22 19:19:02 -0700 |
| commit | 2170df897b9dc72b87cc104520f6a67ddfbb994f (patch) | |
| tree | 3746742dc12c2863c61c4c7cba8f4f9666590e49 | |
| parent | 724e1d15d0441fa169598397416d1e470e539d02 (diff) | |
| download | volse-hubzilla-2170df897b9dc72b87cc104520f6a67ddfbb994f.tar.gz volse-hubzilla-2170df897b9dc72b87cc104520f6a67ddfbb994f.tar.bz2 volse-hubzilla-2170df897b9dc72b87cc104520f6a67ddfbb994f.zip | |
bug #388 - notify_comment received after post deleted
| -rw-r--r-- | include/diaspora.php | 2 | ||||
| -rw-r--r-- | include/items.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 06df9c24a..afd86957b 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 0a8bc12c0..07f62ece5 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']) ); |