strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7307 from annando/delete-events

Browse source 
Fix for distribution of event deletions
This commit is contained in:
Hypolite Petovan 2019-06-23 09:53:35 -04:00 committed by GitHub
commit 2f42cb08fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Event.php
View file

@ -226,7 +226,7 @@ class Event extends BaseObject
return; return;
} }
DBA::delete('event', ['id' => $event_id]); DBA::delete('event', ['id' => $event_id], ['cascade' => false]);
Logger::log("Deleted event ".$event_id, Logger::DEBUG); Logger::log("Deleted event ".$event_id, Logger::DEBUG);
} }

8
src/Model/Item.php
View file

@ -1080,9 +1080,11 @@ class Item extends BaseObject
} }
// When the permission set will be used in photo and events as well, // When the permission set will be used in photo and events as well,
// this query here needs to be extended. // this query here needs to be extended.
if (!empty($item['psid']) && !self::exists(['psid' => $item['psid'], 'deleted' => false])) { // @todo Currently deactivated. We need the permission set in the deletion process.
DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]); // This is a reminder to add the removal somewhere else.
} //if (!empty($item['psid']) && !self::exists(['psid' => $item['psid'], 'deleted' => false])) {
// DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]);
//}
// If it's the parent of a comment thread, kill all the kids // If it's the parent of a comment thread, kill all the kids
if ($item['id'] == $item['parent']) { if ($item['id'] == $item['parent']) {