holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar/CalDAV/eSync: fixed not synced events constructed from exceptions

Browse Source 
removed cal_recurrence filter in read, as cal_reference and cal_recurence is always used together for exceptions, but cal_recurrence was not allways reset to 0
This commit is contained in:
Ralf Becker 2015-01-20 13:49:18 +00:00
parent 4eb63d65ec
commit e8b3a3635c
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calendar/inc/class.calendar_so.inc.php
View File

@ -306,7 +306,6 @@ class calendar_so
// We want only the parents to match
$where['cal_uid'] = $ids;
$where['cal_reference'] = 0;
$where['cal_recurrence'] = 0;
}
elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids)) // one or more cal_id's
{

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

@ -672,7 +672,7 @@ class calendar_uiforms extends calendar_ui
else // conflict or error, we need to reset everything to the state befor we tried to save it
{
$event['id'] = $event['reference'];
unset($event['reference']);
$event['reference'] = $event['recurrence'] = 0;
$event['uid'] = $content['uid'];
}
}

2
calendar/setup/tables_update.inc.php
View File

@ -2310,7 +2310,7 @@ function calendar_upgrade14_1()
{
$GLOBALS['egw_setup']->db->query(
"UPDATE egw_cal
SET cal_reference=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
SET cal_reference=0,cal_recurrence=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
WHERE cal_reference != 0 AND cal_id IN (SELECT cal_id FROM egw_cal_repeats)", __LINE__, __FILE__);
foreach($GLOBALS['egw_setup']->db->query(