From 98fd592b08a5525790b8f63501175778cc9a36f5 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 18 Jan 2018 18:23:02 +1300
Subject: [PATCH] Minor api tidy up.

It is recommended practice to pass the entity to the api. This minor fix up supports that
---
 api/v3/Acl.php               | 2 +-
 api/v3/AclRole.php           | 2 +-
 api/v3/ActivityContact.php   | 2 +-
 api/v3/ContributionRecur.php | 4 +---
 api/v3/CustomGroup.php       | 2 +-
 api/v3/OptionValue.php       | 2 +-
 api/v3/PaymentProcessor.php  | 2 +-
 api/v3/Pledge.php            | 5 +----
 api/v3/PriceSet.php          | 2 +-
 api/v3/UFGroup.php           | 2 +-
 api/v3/UFMatch.php           | 2 +-
 11 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/api/v3/Acl.php b/api/v3/Acl.php
index 6564488aa7..f188760a61 100644
--- a/api/v3/Acl.php
+++ b/api/v3/Acl.php
@@ -40,7 +40,7 @@
  *   API result array
  */
 function civicrm_api3_acl_create($params) {
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'Acl');
 }
 
 /**
diff --git a/api/v3/AclRole.php b/api/v3/AclRole.php
index 1cb1febd6a..b1708533b7 100644
--- a/api/v3/AclRole.php
+++ b/api/v3/AclRole.php
@@ -40,7 +40,7 @@
  *   API result array
  */
 function civicrm_api3_acl_role_create($params) {
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'AclRole');
 }
 
 /**
diff --git a/api/v3/ActivityContact.php b/api/v3/ActivityContact.php
index 7f1c1c3848..be02bcc211 100644
--- a/api/v3/ActivityContact.php
+++ b/api/v3/ActivityContact.php
@@ -40,7 +40,7 @@
  *   API result array.
  */
 function civicrm_api3_activity_contact_create($params) {
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'ActivityContact');
 }
 
 /**
diff --git a/api/v3/ContributionRecur.php b/api/v3/ContributionRecur.php
index 2dbdc64e35..0c7a2cd94c 100644
--- a/api/v3/ContributionRecur.php
+++ b/api/v3/ContributionRecur.php
@@ -41,9 +41,7 @@
  *   api result array
  */
 function civicrm_api3_contribution_recur_create($params) {
-  _civicrm_api3_custom_format_params($params, $values, 'ContributionRecur');
-  $params = array_merge($params, $values);
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'ContributionRecur');
 }
 
 /**
diff --git a/api/v3/CustomGroup.php b/api/v3/CustomGroup.php
index 41df30b555..cf32d77f91 100644
--- a/api/v3/CustomGroup.php
+++ b/api/v3/CustomGroup.php
@@ -61,7 +61,7 @@ function civicrm_api3_custom_group_create($params) {
     $params['extends_entity_column_value'] = CRM_Utils_Array::explodePadded($params['extends_entity_column_value']);
   }
 
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'CustomGroup');
 }
 
 /**
diff --git a/api/v3/OptionValue.php b/api/v3/OptionValue.php
index 0f960ee9e6..a10cb899c9 100644
--- a/api/v3/OptionValue.php
+++ b/api/v3/OptionValue.php
@@ -67,7 +67,7 @@ function _civicrm_api3_option_value_get_spec(&$params) {
  *   API result array
  */
 function civicrm_api3_option_value_create($params) {
-  $result = _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  $result = _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'OptionValue');
   if (!empty($params['id']) && !array_key_exists('option_group_id', $params)) {
     $groupId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue',
       $params['id'], 'option_group_id', 'id'
diff --git a/api/v3/PaymentProcessor.php b/api/v3/PaymentProcessor.php
index cc3d54af7a..4cde5fb1f1 100644
--- a/api/v3/PaymentProcessor.php
+++ b/api/v3/PaymentProcessor.php
@@ -46,7 +46,7 @@ function civicrm_api3_payment_processor_create($params) {
       'return' => 'payment_instrument_id',
     ));
   }
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'PaymentProcesor');
 }
 
 /**
diff --git a/api/v3/Pledge.php b/api/v3/Pledge.php
index 44378dcb7b..596c10655f 100644
--- a/api/v3/Pledge.php
+++ b/api/v3/Pledge.php
@@ -42,10 +42,7 @@
  */
 function civicrm_api3_pledge_create($params) {
   _civicrm_api3_pledge_format_params($params, TRUE);
-  $values = $params;
-  //format the custom fields
-  _civicrm_api3_custom_format_params($params, $values, 'Pledge');
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $values);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'Pledge');
 }
 
 /**
diff --git a/api/v3/PriceSet.php b/api/v3/PriceSet.php
index b7b15e6019..6ecb5da9c6 100644
--- a/api/v3/PriceSet.php
+++ b/api/v3/PriceSet.php
@@ -45,7 +45,7 @@
  *   api result array
  */
 function civicrm_api3_price_set_create($params) {
-  $result = _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  $result = _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'PriceSet');
   // Handle price_set_entity
   if (!empty($result['id']) && !empty($params['entity_table']) && !empty($params['entity_id'])) {
     $entityId = $params['entity_id'];
diff --git a/api/v3/UFGroup.php b/api/v3/UFGroup.php
index 77655ad80a..2816791aaf 100644
--- a/api/v3/UFGroup.php
+++ b/api/v3/UFGroup.php
@@ -58,7 +58,7 @@ function _civicrm_api3_uf_group_create_spec(&$params) {
  *   API result array
  */
 function civicrm_api3_uf_group_create($params) {
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'UFGroup');
 }
 
 /**
diff --git a/api/v3/UFMatch.php b/api/v3/UFMatch.php
index 6fdcc270a9..8ecdf16d95 100644
--- a/api/v3/UFMatch.php
+++ b/api/v3/UFMatch.php
@@ -52,7 +52,7 @@ function civicrm_api3_uf_match_get($params) {
  *   Api result array
  */
 function civicrm_api3_uf_match_create($params) {
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'UFMatch');
 }
 
 /**
-- 
2.25.1