Skip to content

Commit 22f2119

Browse files
committed
Merge branch '136-all-day-events-spanning-two-days-on-ios' into 'master'
TimeZoneStruct wDayOfWeek and wDay were switched whan calculating DST start and end. Closes #136 See merge request grommunio/grommunio-sync!104
2 parents eccc143 + 7800139 commit 22f2119

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/grommunio/mapiprovider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2490,8 +2490,8 @@ private function isDST($localtime, $tz) {
24902490
}
24912491

24922492
$year = gmdate("Y", $localtime);
2493-
$start = $this->getTimestampOfWeek($year, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"]);
2494-
$end = $this->getTimestampOfWeek($year, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"]);
2493+
$start = $this->getTimestampOfWeek($year, $tz["dststartmonth"], $tz["dststartweek"], $tz["dststartday"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"]);
2494+
$end = $this->getTimestampOfWeek($year, $tz["dstendmonth"], $tz["dstendweek"], $tz["dstendday"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"]);
24952495

24962496
if ($start < $end) {
24972497
// northern hemisphere (july = dst)

0 commit comments

Comments
 (0)