using created and modified timestamps from calendar, and not reading them separate from egw_content_history table

This commit is contained in:
Ralf Becker 2010-08-05 17:58:25 +00:00
parent 9a0d77469f
commit e7c292d683

View File

@ -846,17 +846,13 @@ class calendar_ical extends calendar_boupdate
}
}
$modified = $GLOBALS['egw']->contenthistory->getTSforAction('calendar',$event['id'],'modify');
$created = $GLOBALS['egw']->contenthistory->getTSforAction('calendar',$event['id'],'add');
if (!$created && !$modified) $created = $event['modified'];
if ($created)
if ($event['created'] || $event['modified'])
{
$attributes['CREATED'] = $created;
$attributes['CREATED'] = $event['created'] ? $event['created'] : $event['modified'];
}
if (!$modified) $modified = $event['modified'];
if ($modified)
if ($event['modified'])
{
$attributes['LAST-MODIFIED'] = $modified;
$attributes['LAST-MODIFIED'] = $event['modified'];
}
$attributes['DTSTAMP'] = time();
foreach ((array)$event['alarm'] as $alarmID => $alarmData)