From: Coleman Watts Date: Thu, 11 Jul 2013 03:56:21 +0000 (-0700) Subject: Allow 'all' keyword in getfields.options X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ed8abbbb8f28f752fe5e559b537ed946406d5b20;p=civicrm-core.git Allow 'all' keyword in getfields.options --- diff --git a/api/v3/Generic.php b/api/v3/Generic.php index 050a077ca8..2d5b6fb431 100644 --- a/api/v3/Generic.php +++ b/api/v3/Generic.php @@ -246,7 +246,7 @@ function _civicrm_api3_generic_get_metadata_options(&$metadata, $entity, $fieldn return; } - if (!empty($metadata[$fieldname]['options']) || !in_array($fieldname, $fieldsToResolve)) { + if (!empty($metadata[$fieldname]['options']) || (!in_array($fieldname, $fieldsToResolve) && !in_array('all', $fieldsToResolve))) { return; }