diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-23 08:11:35 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-23 08:11:35 +0530 |
| commit | 6e4760dd9c512147309b5e4a98d25216610f81da (patch) | |
| tree | cd1ea2edf6b257e52ab8fd10c781ba600d884506 /include/datetime.php | |
| parent | 11974b4d948ae5d9b9fb53970838463bd88bb9f6 (diff) | |
| parent | 4e7eb36dd1e65bf481ffe30614565674cbef4fe5 (diff) | |
| download | volse-hubzilla-6e4760dd9c512147309b5e4a98d25216610f81da.tar.gz volse-hubzilla-6e4760dd9c512147309b5e4a98d25216610f81da.tar.bz2 volse-hubzilla-6e4760dd9c512147309b5e4a98d25216610f81da.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'include/datetime.php')
| -rw-r--r-- | include/datetime.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/datetime.php b/include/datetime.php index 3b1491e4d..58a618610 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -87,7 +87,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d $from = 'UTC'; if($to === '') $to = 'UTC'; - if($s === '') + if( ($s === '') || (! is_string($s)) ) $s = 'now'; // Slight hackish adjustment so that 'zero' datetime actually returns what is intended |