Merge remote branch 'upstream/master'

[friendica.git] / include / items.php

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'])
                                        );