mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:49:10 +01:00
using created and modified timestamps from calendar, and not reading them separate from egw_content_history table
This commit is contained in:
parent
9a0d77469f
commit
e7c292d683
@ -846,17 +846,13 @@ class calendar_ical extends calendar_boupdate
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$modified = $GLOBALS['egw']->contenthistory->getTSforAction('calendar',$event['id'],'modify');
|
if ($event['created'] || $event['modified'])
|
||||||
$created = $GLOBALS['egw']->contenthistory->getTSforAction('calendar',$event['id'],'add');
|
|
||||||
if (!$created && !$modified) $created = $event['modified'];
|
|
||||||
if ($created)
|
|
||||||
{
|
{
|
||||||
$attributes['CREATED'] = $created;
|
$attributes['CREATED'] = $event['created'] ? $event['created'] : $event['modified'];
|
||||||
}
|
}
|
||||||
if (!$modified) $modified = $event['modified'];
|
if ($event['modified'])
|
||||||
if ($modified)
|
|
||||||
{
|
{
|
||||||
$attributes['LAST-MODIFIED'] = $modified;
|
$attributes['LAST-MODIFIED'] = $event['modified'];
|
||||||
}
|
}
|
||||||
$attributes['DTSTAMP'] = time();
|
$attributes['DTSTAMP'] = time();
|
||||||
foreach ((array)$event['alarm'] as $alarmID => $alarmData)
|
foreach ((array)$event['alarm'] as $alarmID => $alarmData)
|
||||||
|
Loading…
Reference in New Issue
Block a user