Merge pull request #2454 from eileenmcnaughton/CRM-14159

CRM-14159 API Add generic options['metadata'] = labels functionality

diff --cc api/v3/utils.php
index ce2a2d8efb9764dc621144a349d68eaefaf8c37e,7baf7d4867e93c43d65933a0b42c4a0f0c3b6d59..d9043a9044452c7f1e99251f2a97b93f205f1f08
--- 1/api/v3/utils.php
--- 2/api/v3/utils.php
+++ b/api/v3/utils.php
@@@ -966,9 -971,9 +972,9 @@@ function _civicrm_api3_api_check_permis
   */
  function _civicrm_api3_basic_get($bao_name, &$params, $returnAsSuccess = TRUE, $entity = "") {
    $bao = new $bao_name();
 -  _civicrm_api3_dao_set_filter($bao, $params, TRUE,$entity);
 +  _civicrm_api3_dao_set_filter($bao, $params, TRUE, $entity);
    if ($returnAsSuccess) {
-       return civicrm_api3_create_success(_civicrm_api3_dao_to_array($bao, $params, FALSE, $entity), $params, $entity);
+       return civicrm_api3_create_success(_civicrm_api3_dao_to_array($bao, $params, FALSE, $entity), $params, $entity, 'get');
    }
    else {
      return _civicrm_api3_dao_to_array($bao, $params, FALSE, $entity);