diff options
| -rw-r--r-- | include/zot.php | 7 | ||||
| -rwxr-xr-x | mod/like.php | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/zot.php b/include/zot.php index 7fd6f0d4a..62e45b2b3 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1582,7 +1582,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque $arr['aid'] = $channel['channel_account_id']; $arr['uid'] = $channel['channel_id']; - $item_id = delete_imported_item($sender,$arr,$channel['channel_id']); + $item_id = delete_imported_item($sender,$arr,$channel['channel_id'],$relay); $result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); if($relay && $item_id) { @@ -1727,7 +1727,7 @@ function update_imported_item($sender,$item,$uid) { } -function delete_imported_item($sender,$item,$uid) { +function delete_imported_item($sender,$item,$uid,$relay) { logger('delete_imported_item invoked',LOGGER_DEBUG); @@ -1768,7 +1768,8 @@ function delete_imported_item($sender,$item,$uid) { if($item_found) { if($r[0]['item_restrict'] & ITEM_DELETED) { logger('delete_imported_item: item was already deleted'); - return false; + if(! $relay) + return false; } require_once('include/items.php'); diff --git a/mod/like.php b/mod/like.php index 79c746825..47251935a 100755 --- a/mod/like.php +++ b/mod/like.php @@ -316,7 +316,7 @@ function like_content(&$a) { // already liked it. Drop that item. require_once('include/items.php'); foreach($r as $rr) { - drop_item($rr['id'],false,DROPITEM_PHASE1); + drop_item($rr['id'],true,DROPITEM_PHASE1); } if($interactive) return; |