From: Brett Profitt <brett.profitt@gmail.com>
Date: Mon, 5 Sep 2011 00:55:26 +0000 (-0700)
Subject: Fixes #3661. Pulled in recursive delete fixes to master.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0cf99813eb034aa1219a15ba86a105d63a584cc0;p=lorea%2Felgg.git

Fixes #3661. Pulled in recursive delete fixes to master.
---

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