From 8a5271359ca07f5148dfee2bc53b64b91ef9dc01 Mon Sep 17 00:00:00 2001 From: Wouter H Date: Wed, 7 Oct 2020 16:12:26 +0200 Subject: [PATCH 1/2] dev/core#2076 Fix for standalone event registrations confirmation email (event_offline_receipt) so that empty fields are not included in the mail. --- CRM/Event/Form/Participant.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index 71c3204b8ce7..c9c2dc926150 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -1451,9 +1451,11 @@ public function submit($params) { foreach ($values as $fieldValue) { $isPublic = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $fieldValue['custom_group_id'], 'is_public'); if ($isPublic) { - $customFields[$fieldID]['id'] = $fieldID; - $formattedValue = CRM_Core_BAO_CustomField::displayValue($fieldValue['value'], $fieldID, $participants[0]->id); - $customGroup[$customFields[$fieldID]['groupTitle']][$customFields[$fieldID]['label']] = str_replace(' ', '', $formattedValue); + if(!empty($fieldValue['value'])) { + $customFields[$fieldID]['id'] = $fieldID; + $formattedValue = CRM_Core_BAO_CustomField::displayValue($fieldValue['value'], $fieldID, $participants[0]->id); + $customGroup[$customFields[$fieldID]['groupTitle']][$customFields[$fieldID]['label']] = str_replace(' ', '', $formattedValue); + } } } } From 8aa61c6b24a24b197f68e4f459a23ff88adb6ff6 Mon Sep 17 00:00:00 2001 From: Wouter H Date: Sat, 10 Oct 2020 11:02:41 +0200 Subject: [PATCH 2/2] Code style The automatic build was failing because of a code style warning. --- CRM/Event/Form/Participant.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index c9c2dc926150..0fd43fb063e3 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -1451,7 +1451,7 @@ public function submit($params) { foreach ($values as $fieldValue) { $isPublic = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $fieldValue['custom_group_id'], 'is_public'); if ($isPublic) { - if(!empty($fieldValue['value'])) { + if (!empty($fieldValue['value'])) { $customFields[$fieldID]['id'] = $fieldID; $formattedValue = CRM_Core_BAO_CustomField::displayValue($fieldValue['value'], $fieldID, $participants[0]->id); $customGroup[$customFields[$fieldID]['groupTitle']][$customFields[$fieldID]['label']] = str_replace(' ', '', $formattedValue);