keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Michael 2017-06-08 03:56:42 +00:00
parent d5cc757943
commit 0541a62134
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/acl_selectors.php
View file

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

14
view/theme/frio/theme.php
View file

@ -48,7 +48,6 @@ function frio_install() {
register_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu'); 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('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('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"); 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('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('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('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"); logger("uninstalled theme frio");
} }
@ -323,15 +321,3 @@ function frio_acl_lookup(App $a, &$results) {
$results["tot"] = $total; $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;
}