Merge branch '5.0' into 5.1

This commit is contained in:
Robbie Averill 2019-05-02 11:01:50 +12:00
commit 79e343c1d9

View File

@ -47,7 +47,7 @@ class EditableCountryDropdownField extends EditableFormField
public function getValueFromData($data)
{
if (isset($data[$this->Name])) {
if (!empty($data[$this->Name])) {
$source = $this->getFormField()->getSource();
return $source[$data[$this->Name]];
}