Consolidate handling of greeting label

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

diff --git a/api/v3/Generic.php b/api/v3/Generic.php
index bbc58bfbd19c59fa488ab7b4a1d2009523591033..6dfb1c81383a37cc8b2930a345fe11b7279c8ff8 100644 (file)
--- a/api/v3/Generic.php
+++ b/api/v3/Generic.php
@@ -130,7 +130,8 @@ function civicrm_api3_generic_getfields($apiRequest, $unique = TRUE) {
           'api.required' => 1,
           'api.aliases' => [$lowercase_entity . '_id'],
           'type' => CRM_Utils_Type::T_INT,
-        ]];
+        ],
+      ];
       break;
 
     // Note: adding setvalue case here instead of in a generic spec function because
@@ -431,7 +432,7 @@ function civicrm_api3_generic_getoptions($apiRequest) {
   // Validate 'context' from params
   $context = CRM_Utils_Array::value('context', $apiRequest['params']);
   CRM_Core_DAO::buildOptionsContext($context);
-  unset($apiRequest['params']['context'], $apiRequest['params']['field']);
+  unset($apiRequest['params']['context'], $apiRequest['params']['field'], $apiRequest['params']['condition']);
 
   $baoName = _civicrm_api3_get_BAO($apiRequest['entity']);
   $options = $baoName::buildOptions($fieldName, $context, $apiRequest['params']);