Merge pull request #10230 from adixon/CRM-20469

CRM-20469 Event form currency is in a slightly different spot
civicrm · Apr 24, 2017 · 2b09128 · 2b09128
2 parents 70ebdf9 + 6fcd001
commit 2b09128
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/CRM/Core/Payment/ProcessorForm.php b/CRM/Core/Payment/ProcessorForm.php
@@ -72,7 +72,12 @@ public static function preProcess(&$form, $type = NULL, $mode = NULL) {
 
     $form->assign('suppressSubmitButton', $form->_paymentObject->isSuppressSubmitButtons());
 
-    $form->assign('currency', CRM_Utils_Array::value('currency', $form->_values));
+    $currency = CRM_Utils_Array::value('currency', $form->_values);
+    // For event forms, currency is in a different spot
+    if (empty($currency)) {
+      $currency = CRM_Utils_Array::value('currency', $form->_values['event']);
+    }
+    $form->assign('currency', $currency);
 
     // also set cancel subscription url
     if (!empty($form->_paymentProcessor['is_recur']) && !empty($form->_values['is_recur'])) {