From a2a9d8d9ad763b6e9d516843187714a9828bfcfa Mon Sep 17 00:00:00 2001 From: Idayat NOUFOU Date: Thu, 28 Dec 2023 10:49:45 +0100 Subject: [PATCH 1/2] Fix: Unsupported operand types --- htdocs/core/lib/date.lib.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index cebf9ac7b3e..95106821eed 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -122,6 +122,9 @@ function getServerTimeZoneInt($refgmtdate = 'now') function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforendofmonth = 0) { global $conf; + if (empty($duration_value)){ + return $time; + } if ($duration_unit == 's') { return $time + ($duration_value); } From e5f5c499a4b75944be66e0df5ebe46ea7cd8e185 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Dec 2023 12:42:15 +0100 Subject: [PATCH 2/2] Update date.lib.php --- htdocs/core/lib/date.lib.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 95106821eed..be7a7c5996b 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -122,15 +122,12 @@ function getServerTimeZoneInt($refgmtdate = 'now') function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforendofmonth = 0) { global $conf; - if (empty($duration_value)){ + if (empty($duration_value)) { return $time; } if ($duration_unit == 's') { return $time + ($duration_value); } - if ($duration_value == 0) { - return $time; - } if ($duration_unit == 'i') { return $time + (60 * $duration_value); }