aboutsummaryrefslogtreecommitdiffstats
path: root/apps/calendar/lib
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2011-11-30 21:08:42 +0100
committerBart Visscher <bartv@thisnet.nl>2011-11-30 21:13:04 +0100
commite5fdc6013a05268b5b61008ed420cacc0a9d0422 (patch)
treecd36285fe0dedfe719f34e9840c97e54a9e077e4 /apps/calendar/lib
parent2d391298fb048f3fc36a52859c212344f04b6a35 (diff)
downloadnextcloud-server-e5fdc6013a05268b5b61008ed420cacc0a9d0422.tar.gz
nextcloud-server-e5fdc6013a05268b5b61008ed420cacc0a9d0422.zip
Calendar: Use the default timezone that is set in lib/base.php
Diffstat (limited to 'apps/calendar/lib')
-rw-r--r--apps/calendar/lib/object.php2
1 files changed, 1 insertions, 1 deletions
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);