Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respect timezone information in DateTime argument

Browse source
This commit is contained in:
Thomas Bruederli 2012-07-05 11:43:22 +02:00
parent 16770f3612
commit 4b774c06c9
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/libkolab/lib/kolab_format.php
View file

@ -73,7 +73,13 @@ abstract class kolab_format
*/
public static function get_datetime($datetime, $tz = null, $dateonly = false)
{
if (!$tz && $tz !== false) $tz = self::$timezone;
// use timezone information from datetime of global setting
if (!$tz && $tz !== false) {
if ($datetime instanceof DateTime)
$tz = $datetime->getTimezone();
if (!$tz)
$tz = self::$timezone;
}
$result = new cDateTime();
// got a unix timestamp (in UTC)
@ -84,7 +90,7 @@ abstract class kolab_format
else if (is_string($datetime) && strlen($datetime))
$datetime = new DateTime($datetime, $tz ?: null);
if (is_a($datetime, 'DateTime')) {
if ($datetime instanceof DateTime) {
$result->setDate($datetime->format('Y'), $datetime->format('n'), $datetime->format('j'));
if (!$dateonly)