From b86477a363bb4638deb7ad5945e0e5b854f4d1ac Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Tue, 31 Aug 2021 10:47:43 -0400 Subject: [PATCH] put loop back inside the if --- CRM/Contribute/BAO/Contribution.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index f14b272850..d1a068c485 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -5158,13 +5158,13 @@ LIMIT 1;"; return []; } $result = civicrm_api3('Contribution', 'get', ['id' => $id]); - // lab.c.o mail#46 - show labels, not values, for custom fields with option values. - foreach ($result['values'][$id] as $fieldName => $fieldValue) { - if (strpos($fieldName, 'custom_') === 0 && array_search($fieldName, $messageToken['contribution']) !== FALSE) { - $result['values'][$id][$fieldName] = CRM_Core_BAO_CustomField::displayValue($result['values'][$id][$fieldName], $fieldName); - } - } if (!empty($messageToken['contribution'])) { + // lab.c.o mail#46 - show labels, not values, for custom fields with option values. + foreach ($result['values'][$id] as $fieldName => $fieldValue) { + if (strpos($fieldName, 'custom_') === 0 && array_search($fieldName, $messageToken['contribution']) !== FALSE) { + $result['values'][$id][$fieldName] = CRM_Core_BAO_CustomField::displayValue($result['values'][$id][$fieldName], $fieldName); + } + } $processor = new CRM_Contribute_Tokens(); $pseudoFields = array_keys($processor->getPseudoTokens()); foreach ($pseudoFields as $pseudoField) { -- 2.25.1