diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-02 13:38:25 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-02 13:38:25 +0000 |
| commit | de77f9a2af2e29640608e0436d6500bc511f5e46 (patch) | |
| tree | b41f0dfb9aa5c1e3046da82f5ced134e0652bfac /engine/lib/entities.php | |
| parent | 2eea15b54cd8b9c2c74b37b5e5b6513e7f84b0a8 (diff) | |
| download | elgg-de77f9a2af2e29640608e0436d6500bc511f5e46.tar.gz elgg-de77f9a2af2e29640608e0436d6500bc511f5e46.tar.bz2 | |
Refs #3277 merged fix for recursive delete and disabled entities into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@8909 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/entities.php')
| -rw-r--r-- | engine/lib/entities.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php index a4da347ec..742630cc7 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -1493,6 +1493,8 @@ function delete_entity($guid, $recursive = true) { // Make it slightly harder to guess $__RECURSIVE_DELETE_TOKEN = md5(elgg_get_logged_in_user_guid()); + $entity_disable_override = access_get_show_hidden_status(); + access_show_hidden_entities(true); $sub_entities = get_data("SELECT * from {$CONFIG->dbprefix}entities WHERE container_guid=$guid or owner_guid=$guid @@ -1503,6 +1505,7 @@ function delete_entity($guid, $recursive = true) { } } + access_show_hidden_entities($entity_disable_override); $__RECURSIVE_DELETE_TOKEN = null; } |