Merge pull request #9262 from colemanw/caseApi

[civicrm-core.git] / api / api.php

diff --git a/api/api.php b/api/api.php
index 8b55d97347e26335c6a7e5a35d93db3ac4556a8d..80bfedd6d7d087efa7dfda8b4b324f1b6b1562e4 100644 (file)
--- a/api/api.php
+++ b/api/api.php
@@ -20,7 +20,7 @@
  * @return array|int
  */
 function civicrm_api($entity, $action, $params, $extra = NULL) {
-  return \Civi\Core\Container::singleton()->get('civi_api_kernel')->run($entity, $action, $params, $extra);
+  return \Civi::service('civi_api_kernel')->runSafe($entity, $action, $params, $extra);
 }
 
 /**
@@ -40,7 +40,7 @@ function civicrm_api($entity, $action, $params, $extra = NULL) {
  */
 function civicrm_api3($entity, $action, $params = array()) {
   $params['version'] = 3;
-  $result = civicrm_api($entity, $action, $params);
+  $result = \Civi::service('civi_api_kernel')->runSafe($entity, $action, $params);
   if (is_array($result) && !empty($result['is_error'])) {
     throw new CiviCRM_API3_Exception($result['error_message'], CRM_Utils_Array::value('error_code', $result, 'undefined'), $result);
   }
@@ -180,6 +180,9 @@ function _civicrm_api_get_entity_name_from_camel($entity) {
   if (!$entity || $entity === strtolower($entity)) {
     return $entity;
   }
+  elseif ($entity == 'PCP') {
+    return 'pcp';
+  }
   else {
     $entity = ltrim(strtolower(str_replace('U_F',
           'uf',