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 9a2ba88060859b50b905ff5b44cde7464fe26f44..1ef6bd30594b86900955ff98da6420c338a16963 100644 (file)
--- 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 588d364871cf29290de9adf60089afc1e761e0ba..68423adb344891b75b7750fb080bad524656dcab 100644 (file)
--- 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 58d46ce6a7dc89eec07e7d615e4dc7e790a87a7e..770df8b63df8b408452b2a10ccfb737708c5258f 100644 (file)
--- 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);