Branch 'roundcubemail-plugins-kolab-0.7' - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_driver.php |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit f99b98274ff358a35d836d730372de489bfdf7be
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri Jul 6 15:30:06 2012 +0200

    Avoid event date shift when modifying a recurring instance (#868)

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 320a932..5058078 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -708,6 +708,11 @@ class kolab_driver extends calendar_driver
               unset($event['recurrence']['BYMONTH']);
           }
         }
+        // dates did not change, use the ones from master
+        else if ($event['start'] == $old['start'] && $event['end'] == $old['end']) {
+          $event['start'] = $master['start'];
+          $event['end'] = $master['end'];
+        }
 
         $success = $storage->update_event($event);
         break;