Fix undefined currency on event registration

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index 244a32fbe44c17a0017327bf4c8cc87f1526d8e2..bac6d7a1a6e1b04f6c09f4e6bc35abbf6a8ab9f1 100644 (file)
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -274,6 +274,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
     $config = CRM_Core_Config::singleton();
     $currencySymbol = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_Currency', $config->defaultCurrency, 'symbol', 'name');
     $qf->assign('currencySymbol', $currencySymbol);
+    $qf->assign('currency', $config->defaultCurrency);
     // get currency name for price field and option attributes
     $currencyName = $config->defaultCurrency;
 

diff --git a/api/v3/utils.php b/api/v3/utils.php
index 94159385132100cb5be5668baa9310a62c5cf475..93b899b5e0c72add30db491a3876d7e2cec18f66 100644 (file)
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -2244,7 +2244,7 @@ function _civicrm_api3_validate_string(&$params, &$fieldName, &$fieldInfo, $enti
       if ($fieldName == 'currency') {
         //When using IN operator $fieldValue is a array of currency codes
         if (!CRM_Utils_Rule::currencyCode($value)) {
-          throw new Exception("Currency not a valid code: $currency");
+          throw new Exception("Currency not a valid code: $value");
         }
       }
     }