Commit 11fc66a3 authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #273 in ZP/z-push from...

Merge pull request #273 in ZP/z-push from bugfix/ZP-957-timezone-dayofweek-occurrence-are to release/2.2

* commit 'acb959e3':
  ZP-957 Timezone DayOfWeek and week are switched when packing.
parents b6a23e4f acb959e3
...@@ -1107,8 +1107,8 @@ class TimezoneUtil { ...@@ -1107,8 +1107,8 @@ class TimezoneUtil {
"tzname" => self::encodeTZName(self::getMSTZnameFromTZName($servertzname)), "tzname" => self::encodeTZName(self::getMSTZnameFromTZName($servertzname)),
"dstendyear" => $offset[3], "dstendyear" => $offset[3],
"dstendmonth" => $offset[4], "dstendmonth" => $offset[4],
"dstendday" => $offset[6], "dstendday" => $offset[5],
"dstendweek" => $offset[5], "dstendweek" => $offset[6],
"dstendhour" => $offset[7], "dstendhour" => $offset[7],
"dstendminute" => $offset[8], "dstendminute" => $offset[8],
"dstendsecond" => $offset[9], "dstendsecond" => $offset[9],
...@@ -1117,8 +1117,8 @@ class TimezoneUtil { ...@@ -1117,8 +1117,8 @@ class TimezoneUtil {
"tznamedst" => self::encodeTZName(self::getMSTZnameFromTZName($servertzname)), "tznamedst" => self::encodeTZName(self::getMSTZnameFromTZName($servertzname)),
"dststartyear" => $offset[11], "dststartyear" => $offset[11],
"dststartmonth" => $offset[12], "dststartmonth" => $offset[12],
"dststartday" => $offset[14], "dststartday" => $offset[13],
"dststartweek" => $offset[13], "dststartweek" => $offset[14],
"dststarthour" => $offset[15], "dststarthour" => $offset[15],
"dststartminute" => $offset[16], "dststartminute" => $offset[16],
"dststartsecond" => $offset[17], "dststartsecond" => $offset[17],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment