mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-14 10:45:54 +02:00
Code Issues Releases Wiki Activity

Add PR #236 - Fix sanitizer()->date() outputting NULL for valid but falsey values

Browse Source
This commit is contained in:
JanRomero
2023-01-27 15:37:53 -05:00
committed by Ryan Cramer
parent 3e81b0fc4d
commit 15e8a4d0e6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/core/Sanitizer.php
View File

@@ -3914,7 +3914,7 @@ class Sanitizer extends Wire {
$datetime = $this->wire()->datetime; $datetime = $this->wire()->datetime;
$iso8601 = 'Y-m-d H:i:s'; $iso8601 = 'Y-m-d H:i:s';
$_value = trim($this->string($value)); // original value string $_value = trim($this->string($value)); // original value string
if(empty($value)) return $options['default']; if(empty($value) && !is_int($value) && !strlen("$value")) return $options['default'];
if(!is_string($value) && !is_int($value)) $value = $this->string($value); if(!is_string($value) && !is_int($value)) $value = $this->string($value);
if(ctype_digit("$value")) { if(ctype_digit("$value")) {
// value is in unix timestamp format // value is in unix timestamp format
@@ -3925,7 +3925,7 @@ class Sanitizer extends Wire {
$value = $datetime->stringToTimestamp($value, $format); $value = $datetime->stringToTimestamp($value, $format);
} }
// value is now a unix timestamp // value is now a unix timestamp
if(empty($value)) return null; if($value === false) return null;
// if format is provided and in strict mode, validate for the format and bounds // if format is provided and in strict mode, validate for the format and bounds
if($format && $options['strict']) { if($format && $options['strict']) {
$test = $datetime->date($format, $value); $test = $datetime->date($format, $value);
@@ -3942,7 +3942,7 @@ class Sanitizer extends Wire {
if($value > $max) return null; if($value > $max) return null;
} }
if(!empty($options['returnFormat'])) $value = wireDate($options['returnFormat'], $value); if(!empty($options['returnFormat'])) $value = wireDate($options['returnFormat'], $value);
return empty($value) ? null : $value; return ($value === null || $value === false) ? null : $value;
} }
/** /**