Skip to content
Snippets Groups Projects
Commit 34b6969e authored by Henri Queneau's avatar Henri Queneau
Browse files

FIX #2934 the date is good, it's the date + 23h59

parent ded1d69c
No related branches found
No related tags found
No related merge requests found
...@@ -807,14 +807,13 @@ class functions ...@@ -807,14 +807,13 @@ class functions
$day = substr($var[2], 0, 2); $day = substr($var[2], 0, 2);
$hours = $var[3]; $hours = $var[3];
} }
if ($year <= "1900") { if ($year <= "1900") {
return ''; return '';
} else { } else {
if ($databasetype == "SQLSERVER") { if ($databasetype == "SQLSERVER") {
if ($withTimeZone) { if ($withTimeZone) {
return $day . "-" . $month . "-" . $year . " &nbsp; " . $hours; return $day . "-" . $month . "-" . $year . " " . $hours;
}else{ }else{
return $day . "-" . $month . "-" . $year; return $day . "-" . $month . "-" . $year;
} }
...@@ -822,13 +821,13 @@ class functions ...@@ -822,13 +821,13 @@ class functions
} else if ($databasetype == "POSTGRESQL") { } else if ($databasetype == "POSTGRESQL") {
if ($_SESSION['config']['lang'] == "fr") { if ($_SESSION['config']['lang'] == "fr") {
if ($withTimeZone) { if ($withTimeZone) {
return $day . "-" . $month . "-" . $year . " &nbsp; " . $hours; return $day . "-" . $month . "-" . $year . " " . $hours;
}else{ }else{
return $day . "-" . $month . "-" . $year; return $day . "-" . $month . "-" . $year;
} }
} else { } else {
if ($withTimeZone) { if ($withTimeZone) {
return $year . "-" . $month . "-" . $day . " &nbsp; " . $hours; return $year . "-" . $month . "-" . $day . " " . $hours;
}else{ }else{
return $year . "-" . $month . "-" . $day; return $year . "-" . $month . "-" . $day;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment