diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-04-22 15:20:13 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-04-22 15:20:13 +0000 |
| commit | 8b5fd806d6871aaeb179376328a8af215ed44f88 (patch) | |
| tree | a31f8cc50864e11f850e610eaa2877e8f4419e45 /engine/lib/entities.php | |
| parent | d99f1028ce873ab99c345dcea5b4fba67d73203d (diff) | |
| download | elgg-8b5fd806d6871aaeb179376328a8af215ed44f88.tar.gz elgg-8b5fd806d6871aaeb179376328a8af215ed44f88.tar.bz2 | |
Closes #957: Annotations and metadata owned by a deleted user are now also deleted.
git-svn-id: https://code.elgg.org/elgg/trunk@3227 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/entities.php')
| -rw-r--r-- | engine/lib/entities.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php index ff4487570..fc572e29a 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -1843,7 +1843,7 @@ $entity->clearAnnotations();
$entity->clearRelationships();
remove_from_river_by_subject($guid);
- remove_from_river_by_object($guid);
+ remove_from_river_by_object($guid);
$res = delete_data("DELETE from {$CONFIG->dbprefix}entities where guid={$guid}"); if ($res) { @@ -2777,6 +2777,7 @@ // Allow a permission override for recursive entity deletion
// TODO: Can this be done better?
register_plugin_hook('permissions_check','all','recursive_delete_permissions_check'); + register_plugin_hook('permissions_check:metadata','all','recursive_delete_permissions_check'); register_plugin_hook('gc','system','entities_gc');
}
|