tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 05:39:10 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed DropdownField handling of Iterator objects rather than arrays in the newly created getSource()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64318 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-10-15 21:44:38 +00:00
parent 96ec288cd7
commit 2ddc6f13e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forms/DropdownField.php
View File

@ -110,10 +110,10 @@ class DropdownField extends FormField {
* @return array * @return array
*/ */
function getSource() { function getSource() {
if($this->getHasEmptyDefault()) { if(is_array($this->source) && $this->getHasEmptyDefault()) {
return array(""=>$this->emptyString) + (array)$this->source; return array(""=>$this->emptyString) + (array)$this->source;
} else { } else {
return (array)$this->source; return $this->source;
} }
} }