Merge branch '3.6-rc'

[friendica-addons.git] / dav / common / calendar.fnk.php

diff --git a/dav/common/calendar.fnk.php b/dav/common/calendar.fnk.php
index 11f31f7de4e7f3792dec1def9348e12678a89319..ef1a9b0ccdb61bbaca2c1ca2070e51bd0acc2ebe 100644 (file)
--- a/dav/common/calendar.fnk.php
+++ b/dav/common/calendar.fnk.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Util\DateTimeFormat;
 
 define("DAV_ACL_READ", "{DAV:}read");
 define("DAV_ACL_WRITE", "{DAV:}write");
@@ -150,7 +151,7 @@ function vcard_source_compile($vcardsource)
  */
 function wdcal_php2MySqlTime($phpDate)
 {
-       return date("Y-m-d H:i:s", $phpDate);
+       return date(DateTimeFormat::MYSQL, $phpDate);
 }
 
 /**
@@ -159,7 +160,7 @@ function wdcal_php2MySqlTime($phpDate)
  */
 function wdcal_mySql2PhpTime($sqlDate)
 {
-       $ts = DateTime::createFromFormat("Y-m-d H:i:s", $sqlDate);
+       $ts = DateTime::createFromFormat(DateTimeFormat::MYSQL, $sqlDate);
        return $ts->format("U");
 }