From 89b3a395df12411328c33c1d5460f87eb1972024 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Sat, 12 Nov 2011 22:30:09 +0100
Subject: [PATCH] fix timezone for repeating events

---
 apps/calendar/ajax/events.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index f161bb88a0..9a2ba88060 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -39,7 +39,9 @@ foreach($events as $event){
 	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 	$return_event = array();
 	$start_dt = $dtstart->getDateTime();
+	$start_dt->setTimezone(new DateTimeZone($user_timezone));
 	$end_dt = $dtend->getDateTime();
+	$end_dt->setTimezone(new DateTimeZone($user_timezone));
 	if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
 		$return_event['allDay'] = true;
 	}else{
@@ -49,7 +51,7 @@ foreach($events as $event){
 	if($event['repeating'] == 1){
 		$duration = (double) $end_dt->format('U') - (double) $start_dt->format('U');
 		$r = new When();
-		$r->recur((string) $dtstart)->rrule((string) $vevent->RRULE);
+		$r->recur((string) $start_dt->format('Ymd\THis'))->rrule((string) $vevent->RRULE);
 		while($result = $r->next()){
 			if($result->format('U') > $_GET['end']){
 				break;
@@ -71,8 +73,6 @@ foreach($events as $event){
 			$end_dt->modify('-1 sec');
 			$return_event['end'] = $end_dt->format('Y-m-d');
 		}else{
-			$start_dt->setTimezone(new DateTimeZone($user_timezone));
-			$end_dt->setTimezone(new DateTimeZone($user_timezone));
 			$return_event['start'] = $start_dt->format('Y-m-d H:i:s');
 			$return_event['end'] = $end_dt->format('Y-m-d H:i:s');
 			$return_event['allDay'] = false;