MAJ en Thelia 2.3.4

This commit is contained in:
2020-05-03 08:14:07 +02:00
parent 72ddf49e60
commit 35a800ca0e
328 changed files with 9560 additions and 14163 deletions

View File

@@ -175,13 +175,13 @@ class ExportHandler
}
}
if (!($rangeDate['start'] instanceof \DateTime)) {
if ($rangeDate['start'] && !($rangeDate['start'] instanceof \DateTime)) {
$rangeDate['start'] = \DateTime::createFromFormat(
'Y-m-d H:i:s',
$rangeDate['start']['year'] . '-' . $rangeDate['start']['month'] . '-1 00:00:00'
);
}
if (!($rangeDate['end'] instanceof \DateTime)) {
if ($rangeDate['end'] && !($rangeDate['end'] instanceof \DateTime)) {
$rangeDate['end'] = \DateTime::createFromFormat(
'Y-m-d H:i:s',
$rangeDate['end']['year'] . '-' . ($rangeDate['end']['month'] + 1) . '-0 23:59:59'