Closes #148 - correctly apply time zone data

Remove unreachable code
u01jmg3 · Jun 29, 2017 · 83c699b · 83c699b
1 parent 5f85732
commit 83c699b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/ICal/ICal.php b/src/ICal/ICal.php
@@ -683,7 +683,8 @@ public function iCalDateWithTimeZone(array $event, $key, $format = self::DATE_TI
             $duration = end($dateArray);
             $dateTime = $this->parseDuration($event['DTSTART'], $duration, null);
         } else {
-            $dateTime = $this->iCalDateToDateTime($dateArray[3], false, true);
+            $dateTime = new \DateTime($dateArray[1], new \DateTimeZone('UTC'));
+            $dateTime->setTimezone(new \DateTimeZone($this->calendarTimeZone()));
         }
 
         // Force time zone
@@ -838,7 +839,7 @@ protected function processRecurrences()
                     // Get Until
                     $until = strtotime($rrules['UNTIL']);
                 } elseif (isset($rrules['COUNT'])) {
-                    $countOrig  = (is_numeric($rrules['COUNT']) && $rrules['COUNT'] > 1) ? $rrules['COUNT'] : 0;
+                    $countOrig = (is_numeric($rrules['COUNT']) && $rrules['COUNT'] > 1) ? $rrules['COUNT'] : 0;
 
                     // Increment count by the number of excluded dates
                     $countOrig += sizeof($exdates);
@@ -1459,8 +1460,6 @@ protected function processRecurrences()
                         $recurrenceEvents    = array(); // Reset
 
                         break;
-
-                        $events = (isset($countOrig) && sizeof($events) > $countOrig) ? array_slice($events, 0, $countOrig) : $events; // Ensure we abide by COUNT if defined
                 }
             }
         }