Branch 'roundcubemail-plugins-kolab-format2-horde5' - plugins/calendar

Thomas Brüderli bruederli at kolabsys.com
Tue Jul 23 08:52:07 CEST 2013


 plugins/calendar/calendar.php |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 23cb0c658f32beff1ea92971028783f166ac2291
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Jul 23 08:51:36 2013 +0200

    Treat event.changed property as unix timestamp

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index d2e383a..09ef214 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -708,8 +708,6 @@ class calendar extends rcube_plugin
         $status = $event['fallback'];
         $latest = false;
         $html = html::div('rsvp-status', $status != 'CANCELLED' ? $this->gettext('acceptinvitation') : '');
-        if (is_numeric($event['changed']))
-          $event['changed'] = new DateTime('@'.$event['changed']);
         $this->load_driver();
         if ($existing = $this->driver->get_event($event, true, false, true)) {
           $latest = ($event['sequence'] && $existing['sequence'] == $event['sequence'])
@@ -1938,7 +1936,7 @@ class calendar extends rcube_plugin
     if ($success) {
       $message = $this->ical->method == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : 'importedsuccessfully');
       $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
-      $this->rc->output->command('plugin.fetch_event_rsvp_status', array('uid' => $event['uid'], 'changed' => $event['changed']->format('U'), 'sequence' => intval($event['sequence']), 'fallback' => strtoupper($status)));
+      $this->rc->output->command('plugin.fetch_event_rsvp_status', array('uid' => $event['uid'], 'changed' => $event['changed'], 'sequence' => intval($event['sequence']), 'fallback' => strtoupper($status)));
       $error_msg = null;
     }
     else if ($error_msg)




More information about the commits mailing list