Merge branch 'develop'

andriyun · andriyun · commit bec9079c7509 · 2021-03-24T15:21:13.000+01:00
diff --git a/modules/os2forms_sbsys/src/Element/WebformAttachmentSbsysXml.php b/modules/os2forms_sbsys/src/Element/WebformAttachmentSbsysXml.php
@@ -245,7 +245,7 @@ public static function getConfigurationValue($name, array $config, WebformSubmis
     }
     $data = $webform_submission->getData();
     if ($config[$name] != '_custom_') {
-      return isset($config[$name . "_custom"]) ? htmlspecialchars($data[$config[$name]]) : '';
+      return isset($data[$config[$name]]) ? htmlspecialchars($data[$config[$name]]) : '';
     }
     else {
       return isset($config[$name . "_custom"]) ? htmlspecialchars($config[$name . "_custom"]) : '';

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ public static function getConfigurationValue($name, array $config, WebformSubmis`
`245`	`245`	`}`
`246`	`246`	`$data = $webform_submission->getData();`
`247`	`247`	`if ($config[$name] != '_custom_') {`
`248`		`- return isset($config[$name . "_custom"]) ? htmlspecialchars($data[$config[$name]]) : '';`
	`248`	`+ return isset($data[$config[$name]]) ? htmlspecialchars($data[$config[$name]]) : '';`
`249`	`249`	`}`
`250`	`250`	`else {`
`251`	`251`	`return isset($config[$name . "_custom"]) ? htmlspecialchars($config[$name . "_custom"]) : '';`