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

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index a4da347eca6d14eecfd04b3834efefb14b08277c..742630cc7033d929e3d4126f5c945600996acf3f 100644 (file)
--- 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;
                                }