bug #388 notify_comment sent after post deleted

diff --git a/facebook.tgz b/facebook.tgz
index 681be28a89cf5845cb2dcc9e30118a122ebe5a13..a3e60e2d7b09fd249696efef1694c7f2b9ec18e2 100644 (file)
Binary files a/facebook.tgz and b/facebook.tgz differ

diff --git a/facebook/facebook.php b/facebook/facebook.php
index 874ef3022da9ea972732f686228f3d206931fa08..011b9ac1000600749b36b3b2b29d6f5c89e45d6a 100644 (file)
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -1425,7 +1425,7 @@ function fb_consume_comment(&$a, &$user, &$self, $fb_id, $wall, &$orig_post, &$c
     $cmntdata['body'] = $cmnt->message;
     $item = item_store($cmntdata);
 
-    $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($orig_post['uri']),
         intval($uid)
     );

diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index 7ef9d884ffc87d5708dfdc5d4ab5ea1f3981cb4f..8aae089db8c8c1a74b68682c1d8fbed27125b658 100644 (file)
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ