From be18410907480307a5fc26c6c353dea6c9fdb1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= Date: Mon, 3 May 2010 06:50:50 +0000 Subject: [PATCH] Fix Edit all-day recurring event issues --- calendar/inc/class.calendar_uiforms.inc.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 156ac489f8..ff7a25a70b 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -819,7 +819,7 @@ class calendar_uiforms extends calendar_ui ); $cal_id = (int) $_GET['cal_id']; - if (!$cal_id || $cal_id && !($event = $this->bo->read($cal_id,$_GET['date'])) || !$this->bo->check_perms(EGW_ACL_READ,$event)) + if (!$cal_id || $cal_id && !($event = $this->bo->read($cal_id))) { if ($cal_id) { @@ -837,6 +837,13 @@ class calendar_uiforms extends calendar_ui } else { + if (!empty($event['whole_day']) && $event['recur_type'] != MCAL_RECUR_NONE && $_GET['exception']) + { + $date = new egw_time((int)$_GET['date'], egw_time::$user_timezone); + $date =& $this->bo->so->startOfDay($date); + $date->setUser(); + $event = $this->bo->read($cal_id, $date); + } $preserv['actual_date'] = $event['start']; // remember the date clicked if ($event['recur_type'] != MCAL_RECUR_NONE) {