diff --git a/wire/core/WireDateTime.php b/wire/core/WireDateTime.php index d748e7fc..09611a8e 100644 --- a/wire/core/WireDateTime.php +++ b/wire/core/WireDateTime.php @@ -446,7 +446,8 @@ class WireDateTime extends Wire { $test = trim(preg_replace('/[^\d]/', '', $str), '0'); if(!strlen($test)) return $options['emptyReturnValue']; } - return strtotime($str, $options['baseTimestamp']); + if($options['baseTimestamp'] === null) return strtotime($str); + return strtotime($str, $options['baseTimestamp']) ; }