* Admin: Fix some hooks got missed when deleting a user

This commit is contained in:
nathangray 2019-11-04 14:13:23 -07:00
parent ca6ea3a436
commit b8a7c64301

View File

@ -200,16 +200,14 @@ class admin_cmd_delete_account extends admin_cmd
); );
// First do apps that were not selected // First do apps that were not selected
$skip_apps = array(); $skip_apps = array();
$do_last = array('preferences','admin'); $do_last = array('preferences','admin','api');
if($this->change_apps) foreach(array_diff(array_keys($GLOBALS['egw_info']['apps']), array_merge($this->change_apps,$do_last)) as $app)
{ {
foreach(array_diff(array_keys($GLOBALS['egw_info']['apps']), array_merge($this->change_apps,$do_last)) as $app) $skip_apps[] = $app;
{ Api\Hooks::single(array_merge($GLOBALS['hook_values'], array('new_owner' => 0)), $app, true);
$skip_apps[] = $app;
Api\Hooks::single(array_merge($GLOBALS['hook_values'], array('new_owner' => 0)), $app, true);
}
} }
// first all other apps, then preferences and admin
// first all other apps, then preferences, admin & api
foreach(array_merge($this->change_apps,$do_last) as $app) foreach(array_merge($this->change_apps,$do_last) as $app)
{ {
Api\Hooks::single($GLOBALS['hook_values'], $app, true); Api\Hooks::single($GLOBALS['hook_values'], $app, true);