bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Added the new parameter to the delete function.

Browse source
This commit is contained in:
Michael 2018-05-26 21:38:45 +00:00
parent 708ddf2b02
commit 54136f3a74
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/api.php
View file

@ -2256,7 +2256,7 @@ function api_statuses_destroy($type)
$ret = api_statuses_show($type); $ret = api_statuses_show($type);
Item::deleteById($id); Item::deleteById($id, PRIORITY_HIGH, api_user());
return $ret; return $ret;
} }
@ -4148,7 +4148,7 @@ function api_fr_photoalbum_delete($type)
if (!DBM::is_result($photo_item)) { if (!DBM::is_result($photo_item)) {
throw new InternalServerErrorException("problem with deleting items occured"); 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 // 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 // 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) // 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.']; $answer = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.'];
return api_format_data("photo_delete", $type, ['$result' => $answer]); return api_format_data("photo_delete", $type, ['$result' => $answer]);

4
include/items.php
View file

@ -321,7 +321,7 @@ function drop_items($items) {
if (count($items)) { if (count($items)) {
foreach ($items as $item) { foreach ($items as $item) {
$owner = Item::deleteById($item); $owner = Item::deleteById($item, PRIORITY_HIGH, local_user());
if ($owner && !$uid) if ($owner && !$uid)
$uid = $owner; $uid = $owner;
} }
@ -393,7 +393,7 @@ function drop_item($id) {
} }
// delete the item // delete the item
Item::deleteById($item['id']); Item::deleteById($item['id'], PRIORITY_HIGH, local_user());
goaway(System::baseUrl() . '/' . $_SESSION['return_url']); goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
//NOTREACHED //NOTREACHED

2
mod/events.php
View file

@ -545,7 +545,7 @@ function events_content(App $a) {
// Delete only real events (no birthdays) // Delete only real events (no birthdays)
if (DBM::is_result($ev) && $ev[0]['type'] == 'event') { 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) { if ($del == 0) {

2
mod/item.php
View file

@ -877,7 +877,7 @@ function item_content(App $a) {
$o = ''; $o = '';
if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
if (is_ajax()) { if (is_ajax()) {
$o = Item::deleteById($a->argv[2]); $o = Item::deleteById($a->argv[2], PRIORITY_HIGH, local_user());
} else { } else {
$o = drop_item($a->argv[2]); $o = drop_item($a->argv[2]);
} }

4
mod/photos.php
View file

@ -289,7 +289,7 @@ function photos_post(App $a)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { 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) intval($page_owner_uid)
); );
if (DBM::is_result($i)) { 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 // Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid); Photo::clearAlbumCache($page_owner_uid);

2
mod/videos.php
View file

@ -169,7 +169,7 @@ function videos_post(App $a) {
); );
if (DBM::is_result($i)) { if (DBM::is_result($i)) {
Item::deleteById($i[0]['id']); Item::deleteById($i[0]['id'], PRIORITY_HIGH, local_user());
} }
} }