extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Edit all-day recurring event issues

Browse Source
This commit is contained in:
Jörg Lehrke 2010-05-03 06:50:50 +00:00
parent bb0ab3d0ff
commit be18410907
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -819,7 +819,7 @@ class calendar_uiforms extends calendar_ui
); );
$cal_id = (int) $_GET['cal_id']; $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) if ($cal_id)
{ {
@ -837,6 +837,13 @@ class calendar_uiforms extends calendar_ui
} }
else 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 $preserv['actual_date'] = $event['start']; // remember the date clicked
if ($event['recur_type'] != MCAL_RECUR_NONE) if ($event['recur_type'] != MCAL_RECUR_NONE)
{ {