The function "construct_acl_data" isn't used at all, it seems. it is deactivated now

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 9ef1977bc5fd68d83f025383f4a52331451e19fe..725f69a6567df6de8390e7c0c67818ab4ebb7c2b 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -388,13 +388,9 @@ function populate_acl($user = null, $show_jotnets = false) {
 }
 
 function construct_acl_data(App $a, $user) {
-
-       $arr = array('user' => $user);
-       call_hooks('construct_acl_data', $arr);
-
-       if (isset($arr['cancel'])) {
-               return;
-       }
+       // This function is now deactivated. It seems as if the generated data isn't used anywhere.
+       // We will remove the function completely before the release of 3.5.3 when there won't be any issues.
+       return;
 
        // Get group and contact information for html ACL selector
        $acl_data = acl_lookup($a, 'html');

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index cbb7324bcbdc365a46f1dd15f25a1b01fd3d17fc..551f39c8f78b560155a94d4ba25ef46e4c9b6cfd 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -48,7 +48,6 @@ function frio_install() {
        register_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
        register_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
        register_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
-       register_hook('construct_acl_data', 'view/theme/frio/theme.php', 'frio_construct_acl_data');
 
        logger("installed theme frio");
 }
@@ -59,7 +58,6 @@ function frio_uninstall() {
        unregister_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
        unregister_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
        unregister_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
-       unregister_hook('construct_acl_data', 'view/theme/frio/theme.php', 'frio_construct_acl_data');
 
        logger("uninstalled theme frio");
 }
@@ -323,15 +321,3 @@ function frio_acl_lookup(App $a, &$results) {
                $results["tot"] = $total;
        }
 }
-
-/**
- * @brief: Deactivate the old style acl selector
- *
- * We don't need the old one for Frio. Deactivating makes page loading much faster
- *
- * @param App $a The app data @TODO Unused
- * @param array $arr We use this array to stop processing. See construct_acl_data in include/acl_selectors.php
- */
-function frio_construct_acl_data(App $a, &$arr) {
-       $arr['cancel'] = true;
-}