From a816708e673fec3dd29701fbf649e16ddfec5cc3 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 22 Jan 2013 15:54:23 +0000 Subject: [PATCH] Fix deleting of entries 'Only admins can purge deleted items' --- calendar/inc/class.calendar_bo.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 53eb4caa42..6493f3a2a0 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1179,7 +1179,7 @@ class calendar_bo } // 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']['user']['apps']['admin'] && $GLOBALS['egw_info']['server']['calendar_delete_history'] != 'userpurge') { $access = false;