diff options
| author | friendica <info@friendica.com> | 2012-06-13 16:25:57 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-13 16:25:57 -0700 |
| commit | 24bf4632af7b060c9d0cbc39ff9cbc5baee741c3 (patch) | |
| tree | 189950bb6251959c743fb0a7423a37ff86e48de2 | |
| parent | 85876be48a8376bf22201a4561ed1642197c6fa3 (diff) | |
| parent | 36491462ba0f2bd5e62d1139341fbd7eee0515f6 (diff) | |
| download | volse-hubzilla-24bf4632af7b060c9d0cbc39ff9cbc5baee741c3.tar.gz volse-hubzilla-24bf4632af7b060c9d0cbc39ff9cbc5baee741c3.tar.bz2 volse-hubzilla-24bf4632af7b060c9d0cbc39ff9cbc5baee741c3.zip | |
Merge https://github.com/friendica/friendica into pull
| -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 f6bf1041e..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 === '' || (! is_string($s))) + if( ($s === '') || (! is_string($s)) ) $s = 'now'; // Slight hackish adjustment so that 'zero' datetime actually returns what is intended |