From 129130b0f7b7a10d8c2178842792193251be8c4e Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 18:01:49 -0700 Subject: [PATCH] fix empty string timezone --- include/datetime.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/datetime.php b/include/datetime.php index 6d395fe3f2..1c43813d3d 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -80,6 +80,13 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang if(! function_exists('datetime_convert')) { function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") { + // Defaults to UTC if nothing is set, but not if set to empty string. + + if($from == '') + $from = 'UTC'; + if($to == '') + $to = 'UTC'; + // Slight hackish adjustment so that 'zero' datetime actually returns what is intended // otherwise we end up with -0001-11-30 ... // add 32 days so that we at least get year 00, and then hack around the fact that