Merge pull request #25223 from eileenmcnaughton/dep_opt

Remove deprecated ids from OptionValue::add
civicrm · Dec 27, 2022 · b31ed08 · b31ed08
2 parents 575bb16 + b73af35
commit b31ed08
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/CRM/Core/BAO/OptionValue.php b/CRM/Core/BAO/OptionValue.php
@@ -126,18 +126,13 @@ public static function setIsActive($id, $is_active) {
    *
    * @param array $params
    *   Reference array contains the values submitted by the form.
-   * @param array $ids
-   *   deprecated Reference array contains the id.
    *
    * @return \CRM_Core_DAO_OptionValue
    *
    * @throws \CRM_Core_Exception
    */
-  public static function add(&$params, $ids = []) {
-    if (!empty($ids['optionValue']) && empty($params['id'])) {
-      CRM_Core_Error::deprecatedFunctionWarning('$params[\'id\'] should be set, $ids is deprecated');
-    }
-    $id = $params['id'] ?? $ids['optionValue'] ?? NULL;
+  public static function add(&$params) {
+    $id = $params['id'] ?? NULL;
 
     // Update custom field data to reflect the new value
     if ($id && isset($params['value'])) {