jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

survive bad/un-parseable input to datetime_convert

Browse source
This commit is contained in:
friendica 2012-06-12 02:06:29 -07:00
parent 8eb81a99c6
commit b6ff71acaa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/datetime.php
View file

@ -87,7 +87,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
$from = 'UTC'; $from = 'UTC';
if($to === '') if($to === '')
$to = 'UTC'; $to = 'UTC';
if($s === '') if($s === '' || (! is_string($s)))
$s = 'now'; $s = 'now';
// Slight hackish adjustment so that 'zero' datetime actually returns what is intended // Slight hackish adjustment so that 'zero' datetime actually returns what is intended