aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-01-28 07:56:09 -0500
committerCash Costello <cash.costello@gmail.com>2012-01-28 07:56:09 -0500
commit7fe8b61374b19c198a95eb97246c0879d6b25802 (patch)
treea177936843e1a9990b19c2201ac971dccb6b195f
parent1a7482cc32bd9589f3b638d4380c55fcd2b08526 (diff)
downloadelgg-7fe8b61374b19c198a95eb97246c0879d6b25802.tar.gz
elgg-7fe8b61374b19c198a95eb97246c0879d6b25802.tar.bz2
Fixes #4329 removed old recursive delete permissions override
-rw-r--r--engine/lib/entities.php28
1 files changed, 0 insertions, 28 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 0b229aac5..4875b2c2f 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2179,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
@@ -2315,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');
}