Merge pull request #17346 from eileenmcnaughton/trans2

[civicrm-core.git] / Civi / API / Request.php

diff --git a/Civi/API/Request.php b/Civi/API/Request.php
index 7a053e37c2abc101d4b08b65390b857ec6bee1a3..5d0457ef7d2933bed191870593027c0349824ff5 100644 (file)
--- a/Civi/API/Request.php
+++ b/Civi/API/Request.php
@@ -34,7 +34,7 @@ class Request {
     switch ($params['version'] ?? NULL) {
       case 3:
         return [
-          'id' => self::$nextId++,
+          'id' => self::getNextId(),
           'version' => 3,
           'params' => $params,
           'fields' => NULL,
@@ -74,7 +74,7 @@ class Request {
    * @return string
    */
   public static function normalizeEntityName($entity) {
-    return \CRM_Utils_String::convertStringToCamel(\CRM_Utils_String::munge($entity));
+    return \CRM_Core_DAO_AllCoreTables::convertEntityNameToCamel(\CRM_Utils_String::munge($entity), TRUE);
   }
 
   /**