Merge pull request #333 from Erkan-Yilmaz/master

missing bracket
This commit is contained in:
friendica 2012-06-13 16:21:15 -07:00
commit 36491462ba
1 changed files with 1 additions and 1 deletions

View File

@ -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