summaryrefslogtreecommitdiff
path: root/app/Core
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2017-01-24 20:16:43 -0500
committerFrederic Guillot <fred@kanboard.net>2017-01-24 20:16:43 -0500
commit81d14efbd1627827a826eecd54fb17121f952921 (patch)
tree630a8b0be1f8c28c8a9f9483a198508df59b6602 /app/Core
parentd81fb20df66fd77e41f0f7d573e60b856b1e9f8a (diff)
Simplify date and time configuration to avoid potential validation issues
Diffstat (limited to 'app/Core')
-rw-r--r--app/Core/DateParser.php3
1 files changed, 1 insertions, 2 deletions
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();
}
/**