diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index f0a7f246bb..e827ff6132 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1180,10 +1180,10 @@ class calendar_bo $access = $user == $owner || $grant & $needed && ($needed == EGW_ACL_FREEBUSY || !$private || $grant & EGW_ACL_PRIVATE); } - // do NOT allow users to purge deleted events, if we dont have 'user_purge' enabled + // do NOT allow users to purge deleted events, if we dont have 'userpurge' enabled if ($access && $needed == EGW_ACL_DELETE && $event['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $user != $this->user && - $GLOBALS['egw_info']['server']['calendar_delete_history'] != 'user_purge') + $GLOBALS['egw_info']['server']['calendar_delete_history'] != 'userpurge') { $access = false; } diff --git a/calendar/templates/default/config.tpl b/calendar/templates/default/config.tpl index c90ae3c133..7dd8a491a2 100644 --- a/calendar/templates/default/config.tpl +++ b/calendar/templates/default/config.tpl @@ -83,7 +83,7 @@