From 721763663962364485e5a9958854a6311f32298b Mon Sep 17 00:00:00 2001 From: brettp Date: Thu, 15 Oct 2009 22:48:01 +0000 Subject: 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 --- engine/lib/admin.php | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'engine/lib/admin.php') 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 -- cgit v1.2.3