Changeset 5682 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

03/08/12 19:17:09 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao na importacao de eventos para participantes convidados

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -135 +135 @@
                 }if(isset($params['endTime'])){
                         
-                        if (!is_numeric($params['endTime']))
+                        if (!is_numeric($params['endTime'])){
                                 $params['endTime'] =   strtotime( $params['endTime'] . ' ' .$event['timezone']).'000';
                                 
-                        if($event['allDay'])
-                                $params['endTime'] =  $params['endTime']  + 86400000;
-                        
+                                if($event['allDay'])
+                                        $params['endTime'] =  $params['endTime']  + 86400000;
+                        }
                         $params['rangeEnd'] = $params['endTime'] ;       
                                 
@@ -243 +243 @@
 
                                 if(!isset($currentTimezone) || $currentTimezone  != $original['criteria']['timezones'][$v['calendar']]){
-                                        $currentTimezone = $original['criteria']['timezones'][$v['calendar']];
+                                        $currentTimezone = isset($original['criteria']['timezones'][$v['calendar']]) ?  $original['criteria']['timezones'][$v['calendar']] : $v['timezone'];
                                         $Time->setTimezone(new DateTimeZone($currentTimezone));
                                 }