summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2012-06-21 11:51:50 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2012-06-21 11:51:50 +0200
commit09d2f767276f6054148425966fda89e189d621f0 (patch)
tree1ac0e9379d2779a900a0fe89ed69af12da38f0f4
parent2f9763d216a759505868b75ff0e4dcf846e7000c (diff)
parent1db253922327bc115bca71fcb4a594b1f06c0353 (diff)
downloadnextcloud-server-09d2f767276f6054148425966fda89e189d621f0.tar.gz
nextcloud-server-09d2f767276f6054148425966fda89e189d621f0.zip
Merge branch 'master' of gitorious.org:owncloud/owncloud
-rw-r--r--apps/calendar/ajax/event/edit.form.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
index 6e5709a18db..26a0cc2a60a 100644
--- a/apps/calendar/ajax/event/edit.form.php
+++ b/apps/calendar/ajax/event/edit.form.php
@@ -27,6 +27,14 @@ $vevent = $object->VEVENT;
$dtstart = $vevent->DTSTART;
$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
switch($dtstart->getDateType()) {
+ case Sabre_VObject_Property_DateTime::UTC:
+ $timeOffset = OC_Calendar_App::$tz*60;
+ $newDT = $dtstart->getDateTime();
+ $newDT->add(new DateInterval("PT" . $timeOffset . "M"));
+ $dtstart->setDateTime($newDT);
+ $newDT = $dtend->getDateTime();
+ $newDT->add(new DateInterval("PT" . $timeOffset . "M"));
+ $dtend->setDateTime($newDT);
case Sabre_VObject_Property_DateTime::LOCALTZ:
case Sabre_VObject_Property_DateTime::LOCAL:
$startdate = $dtstart->getDateTime()->format('d-m-Y');