|
@@ -592,7 +592,8 @@ function modify_filter($user_id, $url_params, $row) {
|
|
if (api_is_platform_admin()) {
|
|
if (api_is_platform_admin()) {
|
|
$result .= ' <a href="'.api_get_path(WEB_AJAX_PATH).'agenda.ajax.php?a=get_user_agenda&user_id='.$user_id.'" class="agenda_opener">'.
|
|
$result .= ' <a href="'.api_get_path(WEB_AJAX_PATH).'agenda.ajax.php?a=get_user_agenda&user_id='.$user_id.'" class="agenda_opener">'.
|
|
Display::return_icon('month.png', get_lang('FreeBusyCalendar'), array(), ICON_SIZE_SMALL).'</a>';
|
|
Display::return_icon('month.png', get_lang('FreeBusyCalendar'), array(), ICON_SIZE_SMALL).'</a>';
|
|
- if (api_get_configuration_value('deny_delete_users')) {
|
|
|
|
|
|
+ $deleteAllowed = !api_get_configuration_value('deny_delete_users');
|
|
|
|
+ if ($deleteAllowed) {
|
|
if ($user_id != api_get_user_id() &&
|
|
if ($user_id != api_get_user_id() &&
|
|
!$user_is_anonymous &&
|
|
!$user_is_anonymous &&
|
|
api_global_admin_can_edit_admin($user_id)
|
|
api_global_admin_can_edit_admin($user_id)
|