Merge pull request #7307 from annando/delete-events

Fix for distribution of event deletions

diff --git a/src/Model/Event.php b/src/Model/Event.php
index d8657c1e9a61a2c706fde9c89131150ba8f0fa58..42742f18e0684170db80adfb9969420d39baf6e8 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -226,7 +226,7 @@ class Event extends BaseObject
                        return;
                }
 
-               DBA::delete('event', ['id' => $event_id]);
+               DBA::delete('event', ['id' => $event_id], ['cascade' => false]);
                Logger::log("Deleted event ".$event_id, Logger::DEBUG);
        }
 

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 579d2f68eb3f7c46422708c4ac7fa36a1624aedb..3c503dd670c454f40870bddf60a3471e5e779ce1 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1080,9 +1080,11 @@ class Item extends BaseObject
                }
                // When the permission set will be used in photo and events as well,
                // this query here needs to be extended.
-               if (!empty($item['psid']) && !self::exists(['psid' => $item['psid'], 'deleted' => false])) {
-                       DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]);
-               }
+               // @todo Currently deactivated. We need the permission set in the deletion process.
+               // 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 ($item['id'] == $item['parent']) {