Merge pull request #20098 from eileenmcnaughton/536

Port #20040
civicrm · Apr 19, 2021 · ddb6be2 · ddb6be2
2 parents faa0e6a + 6c990cc
commit ddb6be2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
@@ -1174,7 +1174,11 @@ protected function getCurrency($params = []) {
    * @throws \CRM_Core_Exception
    */
   protected function getAmount($params = []) {
-    return CRM_Utils_Money::format($params['amount'], NULL, NULL, TRUE);
+    if (!CRM_Utils_Rule::numeric($params['amount'])) {
+      CRM_Core_Error::deprecatedWarning('Passing Amount value that is not numeric is deprecated please report this in gitlab');
+      return CRM_Utils_Money::formatLocaleNumericRoundedByPrecision(filter_var($params['amount'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION), 2);
+    }
+    return CRM_Utils_Money::formatLocaleNumericRoundedByPrecision($params['amount'], 2);
   }
 
   /**