From 81d14efbd1627827a826eecd54fb17121f952921 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 24 Jan 2017 20:16:43 -0500
Subject: Simplify date and time configuration to avoid potential validation
 issues

---
 app/Core/DateParser.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/Core')

diff --git a/app/Core/DateParser.php b/app/Core/DateParser.php
index 5d3be644..9d012d12 100644
--- a/app/Core/DateParser.php
+++ b/app/Core/DateParser.php
@@ -13,7 +13,6 @@ use DateTime;
 class DateParser extends Base
 {
     const DATE_FORMAT = 'm/d/Y';
-    const DATE_TIME_FORMAT = 'm/d/Y H:i';
     const TIME_FORMAT = 'H:i';
 
     /**
@@ -35,7 +34,7 @@ class DateParser extends Base
      */
     public function getUserDateTimeFormat()
     {
-        return $this->configModel->get('application_datetime_format', DateParser::DATE_TIME_FORMAT);
+        return $this->getUserDateFormat().' '.$this->getUserTimeFormat();
     }
 
     /**
-- 
cgit v1.2.3