From e7c292d683b73d986e8a247b9dd57bab1de3d50d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 5 Aug 2010 17:58:25 +0000 Subject: [PATCH] using created and modified timestamps from calendar, and not reading them separate from egw_content_history table --- calendar/inc/class.calendar_ical.inc.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index 3dcba248a3..61930733f4 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -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)