X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=api%2Fv3%2FGeneric.php;h=f35f84379426af6531bfce293c4b22bf9461b50e;hb=b7db6051472ce9f259171dfead637b8d15ed50ae;hp=c4bb0c341710e1ae762f31a0c8a1985ea7e69c26;hpb=12ec5bb5bfe8d3ae7a2ec327f65e521ccf233647;p=civicrm-core.git

diff --git a/api/v3/Generic.php b/api/v3/Generic.php
index c4bb0c3417..f35f843794 100644
--- a/api/v3/Generic.php
+++ b/api/v3/Generic.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
@@ -172,6 +172,9 @@ function civicrm_api3_generic_getfields($apiRequest, $unique = TRUE) {
 
   // find any supplemental information
   $hypApiRequest = array('entity' => $apiRequest['entity'], 'action' => $action, 'version' => $apiRequest['version']);
+  if ($action == 'getsingle') {
+    $hypApiRequest['action'] = 'get';
+  }
   try {
     list ($apiProvider, $hypApiRequest) = \Civi::service('civi_api_kernel')->resolve($hypApiRequest);
     if (isset($hypApiRequest['function'])) {
@@ -472,6 +475,13 @@ function _civicrm_api3_generic_getoptions_spec(&$params, $apiRequest) {
       }
     }
   }
+
+  $entityName = _civicrm_api_get_entity_name_from_camel($apiRequest['entity']);
+  $getOptionsSpecFunction = '_civicrm_api3_' . $entityName . '_getoptions_spec';
+
+  if (function_exists($getOptionsSpecFunction)) {
+    $getOptionsSpecFunction($params);
+  }
 }
 
 /**