Merge branch '5.1' into 5.2

This commit is contained in:
Robbie Averill 2019-05-02 11:01:59 +12:00
commit c7cd970024

View File

@ -84,7 +84,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]];
}