diff options
| author | zottel <github@zottel.net> | 2012-04-23 08:57:49 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-23 08:57:49 +0200 |
| commit | e6847cdd3f6faf087dc7e738e1dbae7d70113451 (patch) | |
| tree | 3746742dc12c2863c61c4c7cba8f4f9666590e49 /include/items.php | |
| parent | 9663299da1be50eef4327778fae619fc6f9edef4 (diff) | |
| parent | 2170df897b9dc72b87cc104520f6a67ddfbb994f (diff) | |
| download | volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.tar.gz volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.tar.bz2 volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rw-r--r-- | include/items.php | 2 |
1 files changed, 1 insertions, 1 deletions
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']) ); |