Fixed issue #17264: Validuntil and validfrom fields don't allow just …

…date (without time) aynmore
LimeSurvey · Apr 20, 2021 · 150022b · 150022b
1 parent 9d9356c
commit 150022b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/models/Token.php b/application/models/Token.php
@@ -430,8 +430,8 @@ public function rules()
             array('usesleft', 'numerical', 'integerOnly' => true, 'allowEmpty' => true, 'min' => -2147483647, 'max' => 2147483647),
             array('mpid', 'numerical', 'integerOnly' => true, 'allowEmpty' => true),
             array('blacklisted', 'in', 'range' => array('Y', 'N'), 'allowEmpty' => true),
-            array('validfrom', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true),
-            array('validuntil','date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true),
+            array('validfrom', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m','yyyy-M-d'],'allowEmpty' => true),
+            array('validuntil','date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m','yyyy-M-d'],'allowEmpty' => true),
             array('emailstatus', 'default', 'value' => 'OK'),
         );
         foreach (decodeTokenAttributes($this->survey->attributedescriptions) as $key => $info) {