From ad166708c68f49bc22c64b975ffe6a5b80cbc2ec Mon Sep 17 00:00:00 2001
From: Sascha Egerer <sascha@sascha-egerer.de>
Date: Thu, 12 Jan 2017 22:14:41 +0100
Subject: [PATCH] [BUGFIX] Default value for native datetime fields must not be
0
The default database value for native fields of type datetime
must not be 0 but NULL.
Resolves: #79304
Releases: master, 8.7
Change-Id: I823a85be2a01ccd8df4997ab2969b2c95ed78cd1
Reviewed-on: https://review.typo3.org/51296
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Form/FormDataProvider/DatabaseRowDateTimeFields.php | 3 +--
typo3/sysext/core/Classes/DataHandling/DataHandler.php | 8 ++++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php
index b05209c611ef..6645476d47cb 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php
@@ -43,8 +43,7 @@ class DatabaseRowDateTimeFields implements FormDataProviderInterface
// makes date() treat it as a UTC date (which is what we store in the database).
$result['databaseRow'][$column] = date('c', strtotime($result['databaseRow'][$column] . ' UTC'));
} else {
- // Set to 0 timestamp
- $result['databaseRow'][$column] = 0;
+ $result['databaseRow'][$column] = null;
}
} else {
// its a UNIX timestamp! We do not modify this here, as it will only be treated as a datetime because
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index c2be5a44a8d7..c2ffc063e59b 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -1729,7 +1729,7 @@ class DataHandler
// normal integer "date" fields (timestamps) are handled in checkValue_input_Eval
if (isset($tcaFieldConf['dbType']) && ($tcaFieldConf['dbType'] === 'date' || $tcaFieldConf['dbType'] === 'datetime')) {
if (empty($value)) {
- $value = 0;
+ $value = null;
} else {
$isDateOrDateTimeField = true;
$dateTimeFormats = QueryHelper::getDateTimeFormats();
@@ -1739,7 +1739,7 @@ class DataHandler
$emptyValue = $dateTimeFormats[$tcaFieldConf['dbType']]['empty'];
// We store UTC timestamps in the database, which is what getTimestamp() returns.
$dateTime = new \DateTime($value);
- $value = $value === $emptyValue ? 0 : $dateTime->getTimestamp();
+ $value = $value === $emptyValue ? null : $dateTime->getTimestamp();
}
}
// Secures the string-length to be less than max.
@@ -1770,6 +1770,10 @@ class DataHandler
}
$res = $this->checkValue_input_Eval($value, $evalCodesArray, $tcaFieldConf['is_in']);
+ if (isset($tcaFieldConf['dbType']) && isset($res['value']) && !$res['value']) {
+ // set the value to null if we have an empty value for a native field
+ $res['value'] = null;
+ }
// Process UNIQUE settings:
// Field is NOT set for flexForms - which also means that uniqueInPid and unique is NOT available for flexForm fields! Also getUnique should not be done for versioning and if PID is -1 ($realPid<0) then versioning is happening...
--
GitLab