From 34b6969e01429f0484c5599bdc3e0abc321c5261 Mon Sep 17 00:00:00 2001
From: Henri Queneau <henri.queneau@maarch.org>
Date: Tue, 6 Oct 2015 07:26:35 +0000
Subject: [PATCH] FIX #2934 the date is good, it's the date + 23h59
---
core/trunk/core/class/class_functions.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/trunk/core/class/class_functions.php b/core/trunk/core/class/class_functions.php
index 736b94effae..35fc6127bbb 100644
--- a/core/trunk/core/class/class_functions.php
+++ b/core/trunk/core/class/class_functions.php
@@ -807,14 +807,13 @@ class functions
$day = substr($var[2], 0, 2);
$hours = $var[3];
-
}
if ($year <= "1900") {
return '';
} else {
if ($databasetype == "SQLSERVER") {
if ($withTimeZone) {
- return $day . "-" . $month . "-" . $year . " " . $hours;
+ return $day . "-" . $month . "-" . $year . " " . $hours;
}else{
return $day . "-" . $month . "-" . $year;
}
@@ -822,13 +821,13 @@ class functions
} else if ($databasetype == "POSTGRESQL") {
if ($_SESSION['config']['lang'] == "fr") {
if ($withTimeZone) {
- return $day . "-" . $month . "-" . $year . " " . $hours;
+ return $day . "-" . $month . "-" . $year . " " . $hours;
}else{
return $day . "-" . $month . "-" . $year;
}
} else {
if ($withTimeZone) {
- return $year . "-" . $month . "-" . $day . " " . $hours;
+ return $year . "-" . $month . "-" . $day . " " . $hours;
}else{
return $year . "-" . $month . "-" . $day;
}
--
GitLab