Merge pull request #12632 from mattwire/joomla_civimenu

[civicrm-core.git] / CRM / Contribute / Form / UpdateBilling.php

diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php
index 1aba1d1b6a34d64f00c1b4b18e3cd6bfc5c36210..166050f676569eba4e5c098f674bd34f4377360f 100644 (file)
--- a/CRM/Contribute/Form/UpdateBilling.php
+++ b/CRM/Contribute/Form/UpdateBilling.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
@@ -335,17 +335,15 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form {
 
       $activityParams = array(
         'source_contact_id' => $this->_subscriptionDetails->contact_id,
-        'activity_type_id' => CRM_Core_OptionGroup::getValue('activity_type',
-          'Update Recurring Contribution Billing Details',
-          'name'
+        'activity_type_id' => CRM_Core_PseudoConstant::getKey(
+          'CRM_Activity_BAO_Activity',
+          'activity_type_id',
+          'Update Recurring Contribution Billing Details'
         ),
         'subject' => ts('Recurring Contribution Billing Details Updated'),
         'details' => $message,
         'activity_date_time' => date('YmdHis'),
-        'status_id' => CRM_Core_OptionGroup::getValue('activity_status',
-          'Completed',
-          'name'
-        ),
+        'status_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'status_id', 'Completed'),
       );
       $session = CRM_Core_Session::singleton();
       $cid = $session->get('userID');