diff options
author | Frederic Guillot <fred@kanboard.net> | 2017-11-15 15:04:12 -0800 |
---|---|---|
committer | Frederic Guillot <fred@kanboard.net> | 2017-11-15 15:05:06 -0800 |
commit | 765cb42725f6035ea33dbcdee103ebefef562ed9 (patch) | |
tree | ea3c921813e6c0ca4962a9792b5a246a7adee591 /app/Validator | |
parent | e03f5d17f0a80d6140030275d37ac48ea3230c66 (diff) | |
parent | 0c378e2b5186175dd664145dcb9f83498c78b929 (diff) |
Solve conflict in PR #3113
Diffstat (limited to 'app/Validator')
-rw-r--r-- | app/Validator/TaskValidator.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Validator/TaskValidator.php b/app/Validator/TaskValidator.php index 21f1abde..3fc70317 100644 --- a/app/Validator/TaskValidator.php +++ b/app/Validator/TaskValidator.php @@ -43,7 +43,7 @@ class TaskValidator extends BaseValidator new Validators\MaxLength('title', t('The maximum length is %d characters', 200), 200), new Validators\MaxLength('reference', t('The maximum length is %d characters', 50), 50), new Validators\Date('date_due', t('Invalid date'), $this->dateParser->getParserFormats()), - new Validators\Date('date_started', t('Invalid date'), array($this->dateParser->getUserDateTimeFormat())), + new Validators\Date('date_started', t('Invalid date'), $this->dateParser->getParserFormats()), new Validators\Numeric('time_spent', t('This value must be numeric')), new Validators\Numeric('time_estimated', t('This value must be numeric')), ); |