From decd0dc035cce0918519bef77742ff87db23e3f3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 12 Jun 2019 11:27:39 +0200 Subject: more work on event item deletion --- include/items.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index 95b696034..b6d8eb652 100755 --- a/include/items.php +++ b/include/items.php @@ -3740,6 +3740,13 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal if($ok_to_delete) { + if ($item['resource_type'] === 'event') { + $x = q("delete from event where event_hash = '%s' and uid = %d", + dbesc($item['resource_id']), + intval($item['uid']) + ); + } + // set the deleted flag immediately on this item just in case the // hook calls a remote process which loops. We'll delete it properly in a second. @@ -3816,7 +3823,10 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal */ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) { - $linked_item = (($item['resource_id']) ? true : false); + //$linked_item = (($item['resource_id']) ? true : false); + + $linked_resource_types = [ 'photo' ]; + $linked_item = (($item['resource_id'] && $item['resource_type'] && in_array($item['resource_type'], $linked_resource_types)) ? true : false); logger('item: ' . $item['id'] . ' stage: ' . $stage . ' force: ' . $force, LOGGER_DATA); -- cgit v1.2.3