From 10cd9458fcd39e33e4961950c5ddc3a976b2321e Mon Sep 17 00:00:00 2001 From: systopia Date: Fri, 17 Jul 2015 08:42:27 +0200 Subject: [PATCH] proposed fix for CRM-16845 --- CRM/Contribute/BAO/Contribution.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index d2ad4c6e37..a2fec19539 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -170,9 +170,12 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { $contribution->id = $contributionID; - if (!CRM_Utils_Rule::currencyCode($contribution->currency)) { - $config = CRM_Core_Config::singleton(); - $contribution->currency = $config->defaultCurrency; + if (empty($contribution->id)) { + // (only) on 'create', make sure that a valid currency is set (CRM-16845) + if (!CRM_Utils_Rule::currencyCode($contribution->currency)) { + $config = CRM_Core_Config::singleton(); + $contribution->currency = $config->defaultCurrency; + } } if ($contributionID && $setPrevContribution) { -- 2.25.1