survive bad/un-parseable input to datetime_convert

diff --git a/include/datetime.php b/include/datetime.php
index 3b1491e4d839429d5fb95390df171be39bc5ad54..f6bf1041e17625fa2a1d37c9e673adbc4bce2659 100644 (file)
--- 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