survive bad/un-parseable input to datetime_convert

11 years ago · b6ff71acaa
parent 8eb81a99c6
commit b6ff71acaa
1 changed files with 1 additions and 1 deletions
--- 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