BUGFIX DateField with setConfig('dmyfields') now validates TRUE for e…

…mpty values (fixes #5458) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103450 467b73ca-7a2a-4603-9d3b-597d59a354a9
silverstripe · Feb 2, 2011 · 577857b · 577857b
1 parent 219c5ff
commit 577857b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/forms/DateField.php b/forms/DateField.php
@@ -351,7 +351,7 @@ function validate($validator) {
 
 		// date format
 		if($this->getConfig('dmyfields')) {
-			$valid = ($this->validateArrayValue($this->value));
+			$valid = (!$this->value || $this->validateArrayValue($this->value));
 		} else {
 			$valid = (Zend_Date::isDate($this->value, $this->getConfig('dateformat'), $this->locale));
 		}

diff --git a/tests/forms/DateFieldTest.php b/tests/forms/DateFieldTest.php
@@ -119,6 +119,12 @@ function testValidateArray() {
 		$f->setValue(array('day' => 29, 'month' => 03, 'year' => 2003));
 		$this->assertTrue($f->validate(new RequiredFields()));
 
+		$f->setValue(null);
+		$this->assertTrue($f->validate(new RequiredFields()), 'NULL values are validating TRUE');
+
+		$f->setValue(array());
+		$this->assertTrue($f->validate(new RequiredFields()), 'Empty array values are validating TRUE');
+
 		// TODO Fix array validation
 		// $f = new DateField('Date', 'Date', array('day' => 9999, 'month' => 9999, 'year' => 9999));
 		// $this->assertFalse($f->validate(new RequiredFields()));