From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 30 Nov 2011 20:08:42 +0000 (+0100)
Subject: Calendar: Use the default timezone that is set in lib/base.php
X-Git-Tag: v3.0~83^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e5fdc6013a05268b5b61008ed420cacc0a9d0422;p=nextcloud-server.git

Calendar: Use the default timezone that is set in lib/base.php
---

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 9a2ba880608..1ef6bd30594 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -30,7 +30,7 @@ $start = DateTime::createFromFormat('U', $_GET['start']);
 $end = DateTime::createFromFormat('U', $_GET['end']);
 
 $events = OC_Calendar_Object::allInPeriod($_GET['calendar_id'], $start, $end);
-$user_timezone = OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone", "Europe/London");
+$user_timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
 $return = array();
 foreach($events as $event){
 	$object = OC_Calendar_Object::parse($event['calendardata']);
diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index 588d364871c..68423adb344 100644
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -29,7 +29,7 @@ if (!$end){
 }
 $start = new DateTime('@'.$start);
 $end = new DateTime('@'.$end);
-$timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', 'Europe/London');
+$timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
 $start->setTimezone(new DateTimeZone($timezone));
 $end->setTimezone(new DateTimeZone($timezone));
 
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 58d46ce6a7d..770df8b63df 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -528,7 +528,7 @@ class OC_Calendar_Object{
 			$dtstart->setDateTime($start, Sabre_VObject_Element_DateTime::DATE);
 			$dtend->setDateTime($end, Sabre_VObject_Element_DateTime::DATE);
 		}else{
-			$timezone = OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone", "Europe/London");
+			$timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
 			$timezone = new DateTimeZone($timezone);
 			$start = new DateTime($from.' '.$fromtime, $timezone);
 			$end = new DateTime($to.' '.$totime, $timezone);