tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add expanded values to DatetimeField

This commit is contained in:
Thomas Portelange 2024-04-08 17:10:43 +02:00 committed by GitHub
parent c0fc61be1e
commit e3c075b7a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Forms/DatetimeField.php
View File

@ -179,8 +179,8 @@ class DatetimeField extends TextField
* Assumes the value is in the defined {@link $timezone} (if one is set),
* and adjusts for server timezone.
*
* @param string $datetime
* @return string The formatted date, or null if not a valid date
* @param ?string $datetime
* @return ?string The formatted date, or null if not a valid date
*/
public function frontendToInternal($datetime)
{
@ -193,6 +193,16 @@ class DatetimeField extends TextField
// Try to parse time with seconds
$timestamp = $fromFormatter->parse($datetime);
// Retry with expanded value
if ($timestamp === false) {
$zeroFormat = $fromFormatter->format(strtotime(date('Y-01-01 00:00:00')));
$expectedLength = strlen($zeroFormat);
if (strlen($datetime) < $expectedLength) {
$expandedValue = $datetime . substr($zeroFormat, strlen($datetime));
$timestamp = $fromFormatter->parse($expandedValue);
}
}
// Try to parse time without seconds, since that's a valid HTML5 submission format
// See https://html.spec.whatwg.org/multipage/infrastructure.html#times
if ($timestamp === false && $this->getHTML5()) {