← All changes | includes/Frontend/Form/View/Theme/Fields/AddressField.php +4 -4 3.1.0 → 3.3.1 View file →

		@@ -14,19 +14,19 @@
14	14	return $inputWrapper->wrapper('');
15	15	}
16	16
17	17	$formManager = FormManager::getInstance($formID);
18		- $fields = $formManager->getFormContent()->fields;
	18	+ $fields = $formManager->getFormContent()->fields;
19	19	$childFields = $field->childFields;
20	20
21	21	$parentChildHTML = '';
22	22
23	23	foreach ($childFields as $childFldKey) {
24		- if (!isset($childFldKey->fldKey) || !isset($fields->{$childFldKey->fldKey})) {
	24	+ if (!isset($childFldKey->fldKey) || !isset($fields->{$childFldKey->fldKey}) || !is_object($fields->{$childFldKey->fldKey})) {
25	25	continue;
26	26	}
27	27
28		- $fldKey = $childFldKey->fldKey;
	28	+ $fldKey = $childFldKey->fldKey;
29	29	$childField = $fields->{$fldKey};
30	30	$isDeactive = property_exists($childField, 'isDeactive') && $childField->isDeactive;
31	31
32	32	if ($isDeactive) {
		@@ -34,9 +34,9 @@
34	34	}
35	35
36	36	preg_match('/\[(\w+)\]$/', $childField->fieldName, $matches);
37	37	$subFieldName = $matches[1] ?? '';
38		- $colSpan = property_exists($childField, 'colSpan') ? (int) $childField->colSpan : 12;
	38	+ $colSpan = property_exists($childField, 'colSpan') ? (int) $childField->colSpan : 12;
39	39
40	40	if ('country' === $childField->typ) {
41	41	$input = CountryField::init($childField, $fldKey, $field_name . '_address', $form_atomic_Cls_map, $formID, $error, $value);
42	42	} else {