Merge pull request #794 from creamarketing/ListboxField_Inconsistency

FIX: ListBoxField and DropdownField should respect getSource()
silverstripe · Sep 14, 2012 · 15f40af · 15f40af
2 parents 7a8c35f + 54d8abc
commit 15f40af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/forms/DropdownField.php b/forms/DropdownField.php
@@ -236,7 +236,7 @@ function getEmptyString() {
 	}
 
 	function performReadonlyTransformation() {
-		$field = new LookupField($this->name, $this->title, $this->source);
+		$field = new LookupField($this->name, $this->title, $this->getSource());
 		$field->setValue($this->value);
 		$field->setForm($this->form);
 		$field->setReadonly(true);

diff --git a/forms/ListboxField.php b/forms/ListboxField.php
@@ -224,7 +224,7 @@ function setValue($val, $obj = null) {
 				// They're silently ignored and overwritten the next time the field is saved.
 				parent::setValue($parts);
 			} else {
-				if(!in_array($val, array_keys($this->source))) {
+				if(!in_array($val, array_keys($this->getSource()))) {
 					throw new InvalidArgumentException(sprintf(
 						'Invalid value "%s" for multiple=false', 
 						Convert::raw2xml($val)