Merge pull request #11795 from mattwire/form_disabled_currency

dev/financial/5 If a currency has been disabled allow the form to be submitted
civicrm · Mar 12, 2018 · 5528fa6 · 5528fa6
2 parents 84c8a58 + b740ee4
commit 5528fa6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
@@ -1804,6 +1804,10 @@ public function addCurrency(
     $setDefaultCurrency = TRUE
   ) {
     $currencies = CRM_Core_OptionGroup::values('currencies_enabled');
+    if (!array_key_exists($defaultCurrency, $currencies)) {
+      Civi::log()->warning('addCurrency: Currency ' . $defaultCurrency . ' is disabled but still in use!');
+      $currencies[$defaultCurrency] = $defaultCurrency;
+    }
     $options = array('class' => 'crm-select2 eight');
     if (!$required) {
       $currencies = array('' => '') + $currencies;