From f9dfe1bcfbea5ca387a2b27acc2401d3be517a77 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 27 Sep 2012 18:31:47 +0200 Subject: [PATCH] Fix: No error when hour not provided Conflicts: htdocs/core/lib/functions.lib.php --- htdocs/core/lib/functions.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a0612f4febe..22c1d56de4a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -944,10 +944,10 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) global $conf; //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -"; - // Clean parameters - if ($hour == -1) $hour=0; - if ($minute == -1) $minute=0; - if ($second == -1) $second=0; + // Clean parameters + if ($hour == -1 || empty($hour)) $hour=0; + if ($minute == -1 || empty($minute)) $minute=0; + if ($second == -1 || empty($second)) $second=0; // Check parameters if ($check)