From 2e87e1f76182a65bec0f96bb7df3cb9e4c87592a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Clermont=C3=A9?= <dclermonte@april.org>
Date: Mon, 13 Aug 2018 14:56:34 +0200
Subject: [PATCH] Fixed the previous fix about end_date bug in case of too far
date.
---
app/classes/Framadate/Services/AdminPollService.php | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php
index 88c9de01..7604082f 100644
--- a/app/classes/Framadate/Services/AdminPollService.php
+++ b/app/classes/Framadate/Services/AdminPollService.php
@@ -37,13 +37,9 @@ class AdminPollService {
$end_date = strtotime($poll->end_date);
if ($end_date < strtotime($poll->creation_date)) {
-
$poll->end_date = $poll->creation_date;
-
} elseif ($end_date > $this->pollService->maxExpiryDate()) {
-
- $poll->end_date = $this->pollService->maxExpiryDate();
-
+ $poll->end_date = utf8_encode(strftime('%Y-%m-%d', $this->pollService->maxExpiryDate()));
}
return $this->pollRepository->update($poll);
--
GitLab