Merge pull request #25033 from kurund/contribution-fee-fixes

fixes dash line appended to the contribution amounts if label is empty
civicrm · Nov 25, 2022 · 879e495 · 879e495
2 parents 5f91da4 + 5f10597
commit 879e495
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
@@ -382,7 +382,7 @@ public static function addQuickFormElement(
 
         foreach ($customOption as $opId => $opt) {
           $preHelpText = $postHelpText = '';
-          $opt['label'] = '<span class="crm-price-amount-label">' . $opt['label'] . '</span>';
+          $opt['label'] = !empty($opt['label']) ? '<span class="crm-price-amount-label">' . $opt['label'] . '</span>' : '';
           if (!empty($opt['help_pre'])) {
             $preHelpText = '<span class="crm-price-amount-help-pre description">' . $opt['help_pre'] . '</span><span class="crm-price-amount-help-pre-separator">:&nbsp;</span>';
           }
@@ -567,7 +567,7 @@ public static function addQuickFormElement(
           $max_value = CRM_Utils_Array::value('max_value', $opt, '');
 
           $preHelpText = $postHelpText = '';
-          $opt['label'] = '<span class="crm-price-amount-label">' . $opt['label'] . '</span>';
+          $opt['label'] = !empty($opt['label']) ? '<span class="crm-price-amount-label">' . $opt['label'] . '</span>' : '';
           if (!empty($opt['help_pre'])) {
             $preHelpText = '<span class="crm-price-amount-help-pre description">' . $opt['help_pre'] . '</span><span class="crm-price-amount-help-pre-separator">:&nbsp;</span>';
           }