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

[Thomas Brüderli]

 plugins/calendar/calendar.php |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 791729080968548a4d64e84ad5726523f5e063da
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Jul 22 19:59:18 2013 +0200

    Consider the 'calendar_itip_dtstampcheck' config option for RSVP button status

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 90e5575..d2e383a 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -712,7 +712,8 @@ class calendar extends rcube_plugin
           $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']) || (!$event['sequence'] && $existing['changed'] && $existing['changed'] >= $event['changed']);
+          $latest = ($event['sequence'] && $existing['sequence'] == $event['sequence'])
+              || (!$event['sequence'] && $existing['changed'] && $this->rc->config->get('calendar_itip_dtstampcheck', false) && $existing['changed'] >= $event['changed']);
           $emails = $this->get_user_emails();
           foreach ($existing['attendees'] as $i => $attendee) {
             if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {