aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-08 18:01:49 -0700
committerfriendica <info@friendica.com>2012-04-08 18:01:49 -0700
commit129130b0f7b7a10d8c2178842792193251be8c4e (patch)
treeca99347dba1818d195ac59d297fd5959dc0f624d /include
parentde3b9e95847640a0cc8119ac0bcc0141cc0403d4 (diff)
downloadvolse-hubzilla-129130b0f7b7a10d8c2178842792193251be8c4e.tar.gz
volse-hubzilla-129130b0f7b7a10d8c2178842792193251be8c4e.tar.bz2
volse-hubzilla-129130b0f7b7a10d8c2178842792193251be8c4e.zip
fix empty string timezone
Diffstat (limited to 'include')
-rw-r--r--include/datetime.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/datetime.php b/include/datetime.php
index 6d395fe3f..1c43813d3 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