[jan] Fix broken offsets during first zone rules.

horde · Oct 18, 2013 · 7d85279 · 7d85279
1 parent 003fc41
commit 7d85279
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/framework/Timezone/lib/Horde/Timezone/Zone.php b/framework/Timezone/lib/Horde/Timezone/Zone.php
@@ -105,7 +105,9 @@ public function toVtimezone()
                 $component = new Horde_Icalendar_Daylight();
             } else {
                 // Represented by a ruleset.
+                $startOffset = $this->_getOffset($i);
                 $this->_tz->getRule($this->_info[$i][1])->addRules($tz, $this->_name, $name, $startOffset, $startDate, $endDate);
+                $startDate = $endDate;
                 // Continue, because addRules() already adds the
                 // component to $tz.
                 continue;
@@ -115,7 +117,6 @@ public function toVtimezone()
             $startOffset = $this->_getOffset($i);
             $component->setAttribute('TZOFFSETTO', $startOffset);
             $component->setAttribute('TZNAME', $name);
-            $startDate = $endDate;
             $tz->addComponent($component);
         }
 

diff --git a/framework/Timezone/package.xml b/framework/Timezone/package.xml
@@ -22,6 +22,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [jan] Fix broken offsets during first zone rules.
 * [jan] Make BYMONTHDAY property as short as possible.
 * [jan] Fix missing time of day in DTSTART and UNTIL properties.
 * [jan] Don&apos;t create transitions that overlap.
@@ -199,6 +200,7 @@
    <date>2013-05-06</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [jan] Fix broken offsets during first zone rules.
 * [jan] Make BYMONTHDAY property as short as possible.
 * [jan] Fix missing time of day in DTSTART and UNTIL properties.
 * [jan] Don&apos;t create transitions that overlap.