From 418017494f853158ac669c279753e621436e5dd1 Mon Sep 17 00:00:00 2001
From: Joe Harvey <joe.harvey@nexustech.je>
Date: Thu, 25 Apr 2019 16:25:51 +0100
Subject: [PATCH] Prevent 'undefined index' warnings when optional country
 dropdown fields are left empty

---
 code/Model/EditableFormField/EditableCountryDropdownField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Model/EditableFormField/EditableCountryDropdownField.php b/code/Model/EditableFormField/EditableCountryDropdownField.php
index b0b4109..f78bae0 100644
--- a/code/Model/EditableFormField/EditableCountryDropdownField.php
+++ b/code/Model/EditableFormField/EditableCountryDropdownField.php
@@ -47,7 +47,7 @@ class EditableCountryDropdownField extends EditableFormField
 
     public function getValueFromData($data)
     {
-        if (isset($data[$this->Name])) {
+        if (isset($data[$this->Name]) && !empty($data[$this->Name])) {
             $source = $this->getFormField()->getSource();
             return $source[$data[$this->Name]];
         }