Merge pull request #164 from JoshuaLuckers/develop

Allow empty isDate, :required should be used to prevent blank field.
Sterc · May 1, 2018 · 393eb9d · 393eb9d
2 parents 233899a + 2424477
commit 393eb9d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/core/components/formit/src/FormIt/Validator.php b/core/components/formit/src/FormIt/Validator.php
@@ -619,11 +619,13 @@ public function isNumber($key,$value) {
      * @return boolean
      */
     public function isDate($key,$value,$format = '%m/%d/%Y') {
-        $ts = false;
-        if (!empty($value)) {
-            $ts = strtotime($value);
+        /* allow empty isDate, :required should be used to prevent blank field */
+        if (empty($value)) {
+            return true;
         }
-        if ($ts === false || empty($value)) {
+
+        $ts = strtotime($value);
+        if ($ts === false) {
             return $this->_getErrorMessage($key,'vTextIsDate','formit.not_date',array(
                 'format' => $format,
                 'field' => $key,