diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
| commit | 8a80ea24d1d8039be6dc532c9db23c60e71eb467 (patch) | |
| tree | 7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /include/datetime.php | |
| parent | c4f4715a541ad89dfd348f14c4e25a83006e74e7 (diff) | |
| parent | af7abcea2715824cbd6460a7323c8bb64bd5b829 (diff) | |
| download | volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.gz volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.bz2 volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.zip | |
Merge remote-tracking branch 'upstream/master'
Merge upstream
Diffstat (limited to 'include/datetime.php')
| -rw-r--r--[-rwxr-xr-x] | include/datetime.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/datetime.php b/include/datetime.php index 6d395fe3f..f4dcfce62 100755..100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -80,6 +80,16 @@ 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 throws an exception if set to empty string. + // Provide some sane defaults regardless. + + if($from === '') + $from = 'UTC'; + if($to === '') + $to = 'UTC'; + if($s === '') + $s = 'now'; + // 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 |