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

[Aleksander Machniak]

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

New commits:
commit db49e053e27507e8c221b34ea910523451ac8c72
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Tue Dec 18 14:08:20 2012 +0100

    Fix bug where event attachments/participants were lost on event move (#1480)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index c632376..8d38a6a 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -637,7 +637,7 @@ class calendar extends rcube_plugin
       case "move":
         $this->prepare_event($event, $action);
         $success = $this->driver->move_event($event);
-        $reload =  $success && $event['_savemode'] ? 2 : 1;
+        $reload  = $success && $event['_savemode'] ? 2 : 1;
         break;
       
       case "remove":
@@ -1586,6 +1586,11 @@ class calendar extends rcube_plugin
     $event['start'] = new DateTime(is_numeric($event['start']) ? '@'.$event['start'] : $event['start'], $this->user_timezone);
     $event['end'] = new DateTime(is_numeric($event['end']) ? '@'.$event['end'] : $event['end'], $this->user_timezone);
 
+    // start/end is all we need for 'move' action (#1480)
+    if ($action == 'move') {
+      return;
+    }
+
     if ($event['recurrence']['UNTIL'])
       $event['recurrence']['UNTIL'] = new DateTime($event['recurrence']['UNTIL'], $this->user_timezone);