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

Merge remote branch 'origin/master' into translation-staging

Browse Source
This commit is contained in:
TeamCity 2012-10-17 20:15:06 +13:00
commit fd82ba943d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/fieldtypes/Enum.php
View File

@ -95,7 +95,9 @@ class Enum extends StringField {
if(!$name) $name = $this->name; if(!$name) $name = $this->name;
$field = new DropdownField($name, $title, $this->enumValues($hasEmpty), $value, $form); $field = new DropdownField($name, $title, $this->enumValues($hasEmpty), $value, $form);
$field->setEmptyString($emptyString); if($hasEmpty) {
$field->setEmptyString($emptyString);
}
return $field; return $field;
} }
@ -130,4 +132,4 @@ class Enum extends StringField {
? array_merge(array('' => ''), ArrayLib::valuekey($this->enum)) ? array_merge(array('' => ''), ArrayLib::valuekey($this->enum))
: ArrayLib::valuekey($this->enum); : ArrayLib::valuekey($this->enum);
} }
} }