From 54136f3a74b2df925449c9017cd4908eef2b8b76 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 26 May 2018 21:38:45 +0000 Subject: [PATCH] Added the new parameter to the delete function. --- include/api.php | 6 +++--- include/items.php | 4 ++-- mod/events.php | 2 +- mod/item.php | 2 +- mod/photos.php | 4 ++-- mod/videos.php | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/api.php b/include/api.php index e25d12c40a..3832257784 100644 --- a/include/api.php +++ b/include/api.php @@ -2256,7 +2256,7 @@ function api_statuses_destroy($type) $ret = api_statuses_show($type); - Item::deleteById($id); + Item::deleteById($id, PRIORITY_HIGH, api_user()); return $ret; } @@ -4148,7 +4148,7 @@ function api_fr_photoalbum_delete($type) if (!DBM::is_result($photo_item)) { throw new InternalServerErrorException("problem with deleting items occured"); } - Item::deleteById($photo_item[0]['id']); + Item::deleteById($photo_item[0]['id'], PRIORITY_HIGH, api_user()); } // now let's delete all photos from the album @@ -4441,7 +4441,7 @@ function api_fr_photo_delete($type) } // function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore // to the user and the contacts of the users (drop_items() do all the necessary magic to avoid orphans in database and federate deletion) - Item::deleteById($photo_item[0]['id']); + Item::deleteById($photo_item[0]['id'], PRIORITY_HIGH, api_user()); $answer = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.']; return api_format_data("photo_delete", $type, ['$result' => $answer]); diff --git a/include/items.php b/include/items.php index c04bef01c3..b84ac701a6 100644 --- a/include/items.php +++ b/include/items.php @@ -321,7 +321,7 @@ function drop_items($items) { if (count($items)) { foreach ($items as $item) { - $owner = Item::deleteById($item); + $owner = Item::deleteById($item, PRIORITY_HIGH, local_user()); if ($owner && !$uid) $uid = $owner; } @@ -393,7 +393,7 @@ function drop_item($id) { } // delete the item - Item::deleteById($item['id']); + Item::deleteById($item['id'], PRIORITY_HIGH, local_user()); goaway(System::baseUrl() . '/' . $_SESSION['return_url']); //NOTREACHED diff --git a/mod/events.php b/mod/events.php index cad440f164..e40e69f500 100644 --- a/mod/events.php +++ b/mod/events.php @@ -545,7 +545,7 @@ function events_content(App $a) { // Delete only real events (no birthdays) if (DBM::is_result($ev) && $ev[0]['type'] == 'event') { - $del = Item::deleteById($ev[0]['itemid']); + $del = Item::deleteById($ev[0]['itemid'], PRIORITY_HIGH, local_user()); } if ($del == 0) { diff --git a/mod/item.php b/mod/item.php index a3ed63cd97..ca79a64028 100644 --- a/mod/item.php +++ b/mod/item.php @@ -877,7 +877,7 @@ function item_content(App $a) { $o = ''; if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { if (is_ajax()) { - $o = Item::deleteById($a->argv[2]); + $o = Item::deleteById($a->argv[2], PRIORITY_HIGH, local_user()); } else { $o = drop_item($a->argv[2]); } diff --git a/mod/photos.php b/mod/photos.php index c8dad750d1..3d38be5037 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -289,7 +289,7 @@ function photos_post(App $a) ); if (DBM::is_result($r)) { foreach ($r as $rr) { - Item::deleteById($rr['id']); + Item::deleteById($rr['id'], PRIORITY_HIGH, $page_owner_uid); } } @@ -349,7 +349,7 @@ function photos_post(App $a) intval($page_owner_uid) ); if (DBM::is_result($i)) { - Item::deleteById($i[0]['id']); + Item::deleteById($i[0]['id'], PRIORITY_HIGH, $page_owner_uid); // Update the photo albums cache Photo::clearAlbumCache($page_owner_uid); diff --git a/mod/videos.php b/mod/videos.php index f4b8c46b1b..6dee4586aa 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -169,7 +169,7 @@ function videos_post(App $a) { ); if (DBM::is_result($i)) { - Item::deleteById($i[0]['id']); + Item::deleteById($i[0]['id'], PRIORITY_HIGH, local_user()); } }