aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-09-04 17:55:26 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-09-04 17:55:26 -0700
commit0cf99813eb034aa1219a15ba86a105d63a584cc0 (patch)
tree421a69e81129804795c4d2e5fe34fed2fbe7c96c
parentb5899156dfba7aa51e14fba302219e73793fa6a2 (diff)
downloadelgg-0cf99813eb034aa1219a15ba86a105d63a584cc0.tar.gz
elgg-0cf99813eb034aa1219a15ba86a105d63a584cc0.tar.bz2
Fixes #3661. Pulled in recursive delete fixes to master.
-rw-r--r--engine/lib/entities.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 68aa7c8fb..cea8af1da 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1498,6 +1498,7 @@ function delete_entity($guid, $recursive = true) {
$entity_disable_override = access_get_show_hidden_status();
access_show_hidden_entities(true);
+ $ia = elgg_set_ignore_access(true);
$sub_entities = get_data("SELECT * from {$CONFIG->dbprefix}entities
WHERE container_guid=$guid
or owner_guid=$guid
@@ -1510,6 +1511,7 @@ function delete_entity($guid, $recursive = true) {
access_show_hidden_entities($entity_disable_override);
$__RECURSIVE_DELETE_TOKEN = null;
+ elgg_set_ignore_access($ia);
}
// Now delete the entity itself