diff options
| author | friendica <info@friendica.com> | 2014-01-04 03:58:21 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-04 03:58:21 -0800 |
| commit | 0c85c9748096d625ae9baa29fb9aad48bab3a208 (patch) | |
| tree | c46720214a5f012b7e088e2f88d07dcb5915b308 /include | |
| parent | 9f4e9f247a032d6e88d677474ead0d9cdaca22bb (diff) | |
| download | volse-hubzilla-0c85c9748096d625ae9baa29fb9aad48bab3a208.tar.gz volse-hubzilla-0c85c9748096d625ae9baa29fb9aad48bab3a208.tar.bz2 volse-hubzilla-0c85c9748096d625ae9baa29fb9aad48bab3a208.zip | |
move js files from core
Diffstat (limited to 'include')
| -rw-r--r-- | include/zot.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php index 9d6f462fe..97c9c4a36 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1368,7 +1368,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) { remove_community_tag($sender,$arr,$channel['channel_id']); $item_id = delete_imported_item($sender,$arr,$channel['channel_id']); - $result[] = array($d['hash'],'deleted',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); + $result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); if($relay && $item_id) { logger('process_delivery: invoking relay'); @@ -1524,10 +1524,11 @@ function delete_imported_item($sender,$item,$uid) { logger('delete_imported_item invoked',LOGGER_DEBUG); - $r = q("select id from item where ( author_xchan = '%s' or owner_xchan = '%s' ) + $r = q("select id from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) and mid = '%s' and uid = %d limit 1", dbesc($sender['hash']), dbesc($sender['hash']), + dbesc($sender['hash']), dbesc($item['mid']), intval($uid) ); |