From b4405056b913663967c5c809d18aba3bdadf9b04 Mon Sep 17 00:00:00 2001
From: Ryan McLaren <ryansm@outlook.com>
Date: Tue, 19 Jul 2016 13:38:24 -0300
Subject: [PATCH 1/2] Update ICSWriter.php

BUGFIX: Fixes [Recoverable Error] Argument 1 passed to ICSWriter::getFormatedDateTime() must be an instance of Date, string given.
---
 code/ICSWriter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/ICSWriter.php b/code/ICSWriter.php
index 00612b9..78544f0 100755
--- a/code/ICSWriter.php
+++ b/code/ICSWriter.php
@@ -158,8 +158,8 @@ protected function addDateTime( CalendarDateTime $dateTime ) {
     	$this->addLine('BEGIN:VEVENT');
 		$this->addLine('UID:' . $this->getUID($dateTime) );
 		$this->addLine('DTSTAMP;TZID=' . Calendar::config()->timezone . ':' . $this->getFormatedDateTime());
-		$this->addLine('DTSTART;TZID=' . Calendar::config()->timezone . ':' . $this->getFormatedDateTime($dateTime->StartDate, $dateTime->StartTime));
-		$this->addLine('DTEND;TZID='   . Calendar::config()->timezone . ':' . $this->getFormatedDateTime($dateTime->StartDate, $dateTime->StartTime));
+		$this->addLine('DTSTART;TZID=' . Calendar::config()->timezone . ':' . $this->getFormatedDateTime(new Date($dateTime->StartDate), new Time($dateTime->StartTime)));
+		$this->addLine('DTEND;TZID='   . Calendar::config()->timezone . ':' . $this->getFormatedDateTime(new Date($dateTime->StartDate), new Time($dateTime->StartTime)));
 		$this->addLine('URL:' . Director::absoluteURL($dateTime->ICSLink()));
 		$this->addLine('SUMMARY:CHARSET=UTF-8:' . $dateTime->Event()->Title);
 		$this->addLine('END:VEVENT');

From b769657a9f8db4480356d10579919ec957326f41 Mon Sep 17 00:00:00 2001
From: Ryan McLaren <ryansm@outlook.com>
Date: Wed, 20 Jul 2016 10:39:17 -0300
Subject: [PATCH 2/2] Use dbObject() for Dates/Times

This fixes [Recoverable Error] Argument 1 passed to ICSWriter::getFormatedDateTime() must be an instance of Date, string given and returns the correct date. Also fixed DTEND line as it now uses EndDate and EndTime
---
 code/ICSWriter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/ICSWriter.php b/code/ICSWriter.php
index 78544f0..06b4faf 100755
--- a/code/ICSWriter.php
+++ b/code/ICSWriter.php
@@ -158,8 +158,8 @@ protected function addDateTime( CalendarDateTime $dateTime ) {
     	$this->addLine('BEGIN:VEVENT');
 		$this->addLine('UID:' . $this->getUID($dateTime) );
 		$this->addLine('DTSTAMP;TZID=' . Calendar::config()->timezone . ':' . $this->getFormatedDateTime());
-		$this->addLine('DTSTART;TZID=' . Calendar::config()->timezone . ':' . $this->getFormatedDateTime(new Date($dateTime->StartDate), new Time($dateTime->StartTime)));
-		$this->addLine('DTEND;TZID='   . Calendar::config()->timezone . ':' . $this->getFormatedDateTime(new Date($dateTime->StartDate), new Time($dateTime->StartTime)));
+		$this->addLine('DTSTART;TZID=' . Calendar::config()->timezone . ':' . $this->getFormatedDateTime($dateTime->dbObject('StartDate'), $dateTime->dbObject('StartTime')));
+		$this->addLine('DTEND;TZID='   . Calendar::config()->timezone . ':' . $this->getFormatedDateTime($dateTime->dbObject('EndDate'), $dateTime->dbObject('EndTime')));
 		$this->addLine('URL:' . Director::absoluteURL($dateTime->ICSLink()));
 		$this->addLine('SUMMARY:CHARSET=UTF-8:' . $dateTime->Event()->Title);
 		$this->addLine('END:VEVENT');