dev/core#1019 Fix currency formatting of Total Amount on Event and Contribution pages...

[civicrm-core.git] / CRM / Event / Tokens.php

diff --git a/CRM/Event/Tokens.php b/CRM/Event/Tokens.php
index 5c6c685875ee8d9ecdbe52574f43fe6b3d11e83e..15784cd87289b3ff72e1ee10b49559e24495c0b6 100644 (file)
--- a/CRM/Event/Tokens.php
+++ b/CRM/Event/Tokens.php
@@ -93,7 +93,7 @@ LEFT JOIN civicrm_phone phone ON phone.id = lb.phone_id
       $stateProvince = \CRM_Core_PseudoConstant::stateProvince();
       $loc['street_address'] = $actionSearchResult->street_address;
       $loc['city'] = $actionSearchResult->city;
-      $loc['state_province'] = \CRM_Utils_Array::value($actionSearchResult->state_province_id, $stateProvince);
+      $loc['state_province'] = $stateProvince[$actionSearchResult->state_province_id] ?? NULL;
       $loc['postal_code'] = $actionSearchResult->postal_code;
       //$entityTokenParams[$tokenEntity][$field] = \CRM_Utils_Address::format($loc);
       $row->tokens($entity, $field, \CRM_Utils_Address::format($loc));
@@ -115,7 +115,7 @@ LEFT JOIN civicrm_phone phone ON phone.id = lb.phone_id
       }
       elseif (!empty($actionSearchResult->entityID)) {
         $info = \CRM_Contribute_BAO_Contribution::getPaymentInfo($actionSearchResult->entityID, 'event');
-        $balancePay = \CRM_Utils_Array::value('balance', $info);
+        $balancePay = $info['balance'] ?? NULL;
         $balancePay = \CRM_Utils_Money::format($balancePay);
       }
       $row->tokens($entity, $field, $balancePay);