Merge pull request #146 from powdevel/fix-phone-retrieval-with-select…

…able-type Check entity type is set on webform settings before compare
colemanw · Aug 6, 2018 · 4311abe · 4311abe
2 parents 79a723d + 534c6f9
commit 4311abe
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/includes/wf_crm_webform_base.inc b/includes/wf_crm_webform_base.inc
@@ -352,9 +352,11 @@ abstract class wf_crm_webform_base {
       $valueFound = false;
       foreach($values as $key => $value){
         if ((in_array($ent, array('address', 'email')) && $value['location_type_id'] == $setting['location_type_id'])
-           ||
-          ($value['location_type_id'] == $setting['location_type_id'] && $value[$ent.'_type_id'] == $setting[$ent.'_type_id'])
-          ) {
+          || (
+             $value['location_type_id'] == $setting['location_type_id'] &&
+             (!isset($setting[$ent.'_type_id']) || $value[$ent.'_type_id'] == $setting[$ent.'_type_id'])
+             )
+        ) {
             $reorderedArray[$key] = $value;
             $valueFound = true;
             unset($values[$key]);