extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 20:49:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Edit recurring event issues again :-(

Browse Source
This commit is contained in:
Jörg Lehrke 2010-05-03 07:52:10 +00:00
parent 58559aacb1
commit 9013a52b81
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -837,25 +837,22 @@ 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 && $_GET['exception'])
{ {
// check if we should create an exception if (empty($event['whole_day']))
if ($_GET['exception'])
{ {
$msg = $this->_create_exception($event,$preserv); $date = $_GET['date'];
} }
else else
{ {
$event = $this->bo->read($cal_id,0,true); $date = new egw_time($_GET['date'], egw_time::$user_timezone);
$date =& $this->bo->so->startOfDay($date);
$date->setUser();
} }
$event = $this->bo->read($cal_id, $date, true);
$preserv['actual_date'] = $event['start']; // remember the date clicked
$msg = $this->_create_exception($event,$preserv);
} }
} }
// set new start and end if given by $_GET // set new start and end if given by $_GET