aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/admin.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-10-15 22:48:01 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-10-15 22:48:01 +0000
commit721763663962364485e5a9958854a6311f32298b (patch)
treee37f278fb0698d4be6bf78fca9bbe506d3a07772 /engine/lib/admin.php
parent35ecb0f617d5a24eb7ed3e767cf323ef959a188f (diff)
downloadelgg-721763663962364485e5a9958854a6311f32298b.tar.gz
elgg-721763663962364485e5a9958854a6311f32298b.tar.bz2
Merged admin access override hook with ignore access system override hook.
get_sql_access_prefix() now correctly uses elgg_check_access_overrides() instead of elgg_get_ignore_access(). git-svn-id: http://code.elgg.org/elgg/trunk@3552 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/admin.php')
-rw-r--r--engine/lib/admin.php19
1 files changed, 0 insertions, 19 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 1ba971347..c680f0a7f 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -104,21 +104,6 @@ function admin_settings_page_handler($page) {
include($path);
}
-
-/**
- * Admin permissions system
- *
- * @return true|null True if the current user is an admin.
- */
-function admin_permissions($hook, $type, $returnval, $params) {
- if (elgg_check_access_overrides()) {
- return true;
- }
-
- // consult other hooks
- return NULL;
-}
-
/**
* Write a persistent message to the administrator's notification window.
*
@@ -165,7 +150,3 @@ function clear_admin_message($guid) {
/// Register init functions
register_elgg_event_handler('init', 'system', 'admin_init');
register_elgg_event_handler('pagesetup', 'system', 'admin_pagesetup');
-
-// Register a plugin hook for permissions
-register_plugin_hook('permissions_check', 'all', 'admin_permissions');
-register_plugin_hook('container_permissions_check', 'all', 'admin_permissions'); \ No newline at end of file