Changeset 7967 for branches/2.5

Timestamp:

03/05/13 18:54:01 (11 years ago)

Author:

douglas

Message:

Ticket #3372 - Problema com eventos que passem pela data da troca de horário de verão

Location:

branches/2.5/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (1 diff)
• schedules.php (modified) (1 diff)

branches/2.5/prototype/modules/calendar/interceptors/DBMapping.php

@@ -975 +975 @@
                 }
 
-
                 if(isset( $v['occurrences'] ) && count( $v['occurrences'] ) > 0){
 
+                    $date->setTimestamp((int) ($v['startTime'] / 1000)); 
+                    $date->setTimezone( new DateTimeZone( $v['timezone'] )); 
+ 
                     foreach( $result[$i]['occurrences'] as &$o){
 
-                        $date->setTimestamp((int) ($o / 1000));
-                        $o = ($date->getTimestamp() + $date->getOffset()).'000';
+                        $o = ($o + $date->getOffset()).'000'; 
 
                     }

branches/2.5/prototype/modules/calendar/schedules.php

@@ -143 +143 @@
             $result[$i]['DayLigth'] = $DayLigth;
 
+
             if(isset( $v['occurrences'] ) && count( $v['occurrences'] ) > 0){
 
+                $date->setTimestamp((int) ($v['startTime'] / 1000)); 
+                $date->setTimezone( new DateTimeZone( $v['timezone'] )); 
+ 
                 foreach( $result[$i]['occurrences'] as &$o){
 
-                    $date->setTimestamp((int) ($o / 1000));
-                    $o = ($date->getTimestamp() + $date->getOffset()).'000';
+                    $o = ((int) ($o / 1000) + $date->getOffset()).'000'; 
 
                 }