diff options
| author | Michael <icarus@dabo.de> | 2012-04-11 18:48:58 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-11 18:48:58 +0200 |
| commit | 39405c8056b4a1d55c97fb2963d8776695dbeb30 (patch) | |
| tree | c9f89ba0e9aacee343cf50b6b8a64468bb8db694 /include/datetime.php | |
| parent | c3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (diff) | |
| parent | cdb6510b9f3007d2afd3081313caa7d045af1e7c (diff) | |
| download | volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.gz volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.bz2 volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/datetime.php')
| -rw-r--r-- | include/datetime.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/datetime.php b/include/datetime.php index 6d395fe3f..f4dcfce62 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 |