1 files changed, 18 insertions, 40 deletions

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 2dc0eb8ae..4875b2c2f 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -738,6 +738,7 @@ function elgg_entity_exists($guid) {
  *           Joined with subtypes by AND. See below)
  *
  * 	subtypes => NULL|STR entity subtype (SQL: subtype IN ('subtype1', 'subtype2))
+ *              Use ELGG_ENTITIES_NO_VALUE for no subtype.
  *
  * 	type_subtype_pairs => NULL|ARR (array('type' => 'subtype'))
  *                        (type = '$type' AND subtype = '$subtype') pairs
@@ -1520,18 +1521,23 @@ 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
-							or site_guid=$guid", 'entity_row_to_elggstar');
-					if ($sub_entities) {
-						foreach ($sub_entities as $e) {
-							// check for equality so that an entity that is its own
-							// owner or container does not cause infinite loop
-							if ($e->guid != $guid) {
-								$e->delete(true);
-							}
-						}
+
+					// @todo there was logic in the original code that ignored
+					// entities with owner or container guids of themselves.
+					// this should probably be prevented in ElggEntity instead of checked for here
+					$options = array(
+						'wheres' => array(
+							"((container_guid = $guid OR owner_guid = $guid OR site_guid = $guid)"
+							. " AND guid != $guid)"
+							),
+						'limit' => 0
+					);
+
+					$batch = new ElggBatch('elgg_get_entities', $options);
+					$batch->setIncrementOffset(false);
+
+					foreach ($batch as $e) {
+						$e->delete(true);
 					}
 
 					access_show_hidden_entities($entity_disable_override);
@@ -2173,29 +2179,6 @@ function elgg_list_registered_entities(array $options = array()) {
 }
 
 /**
- * Check the recursive delete permissions token.
- *
- * If an entity is deleted recursively, a permissions override is required to allow
- * contained or owned entities to be removed.
- *
- * @return bool
- * @elgg_plugin_hook_handler permissions_check all
- * @elgg_plugin_hook_handler permissions_check:metadata all
- * @access private
- */
-function recursive_delete_permissions_check() {
-	static $__RECURSIVE_DELETE_TOKEN;
-
-	if ((elgg_is_logged_in()) && ($__RECURSIVE_DELETE_TOKEN)
-	&& (strcmp($__RECURSIVE_DELETE_TOKEN, md5(elgg_get_logged_in_user_guid())))) {
-		return true;
-	}
-
-	// consult next function
-	return NULL;
-}
-
-/**
  * Checks if $entity is an ElggEntity and optionally for type and subtype.
  *
  * @tip Use this function in actions and views to check that you are dealing
@@ -2309,11 +2292,6 @@ function entities_init() {
 
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'entities_test');
 
-	// Allow a permission override for recursive entity deletion
-	// @todo Can this be done better?
-	elgg_register_plugin_hook_handler('permissions_check', 'all', 'recursive_delete_permissions_check');
-	elgg_register_plugin_hook_handler('permissions_check:metadata', 'all', 'recursive_delete_permissions_check');
-
 	elgg_register_plugin_hook_handler('gc', 'system', 'entities_gc');
 }