extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 14:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CalDAV missing event ID

Browse Source
This commit is contained in:
Jörg Lehrke 2010-02-08 20:42:37 +00:00
parent 30a17bc476
commit de6d609752
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_ical.inc.php
View File

@ -892,6 +892,10 @@ class calendar_ical extends calendar_boupdate
{ {
$event['uid'] = $event_info['stored_event']['uid']; // restore the UID if it was not delivered $event['uid'] = $event_info['stored_event']['uid']; // restore the UID if it was not delivered
} }
elseif (empty($event['id']))
{
$event['id'] = $event_info['stored_event']['id']; // CalDAV does only provide UIDs
}
if ($merge) if ($merge)
{ {
// overwrite with server data for merge // overwrite with server data for merge
@ -1210,7 +1214,7 @@ class calendar_ical extends calendar_boupdate
if ($this->log) if ($this->log)
{ {
$event_info['stored_event'] = $this->read($event_info['stored_event']['id']); $event_info['stored_event'] = $this->read($event_info['stored_event']['id']);
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" . error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n" .
array2string($event_info['stored_event'])."\n",3,$this->logfile); array2string($event_info['stored_event'])."\n",3,$this->logfile);
} }
} }