CRM-17646 - Refactor out CRM_Core_BAO_CustomOption::valuesByID

diff --git a/CRM/Core/BAO/CustomOption.php b/CRM/Core/BAO/CustomOption.php
index 6c44541c839a6d9f1236230032b9424ffda83a95..559f9cb63875bb7fdeac1bddb6758a232dc8269f 100644 (file)
--- a/CRM/Core/BAO/CustomOption.php
+++ b/CRM/Core/BAO/CustomOption.php
@@ -333,27 +333,6 @@ SET    {$dao->columnName} = REPLACE( {$dao->columnName}, %1, %2 )";
     }
   }
 
-  /**
-   * @param int $customFieldID
-   * @param int $optionGroupID
-   *
-   * @return array
-   */
-  public static function valuesByID($customFieldID, $optionGroupID = NULL) {
-    if (!$optionGroupID) {
-      $optionGroupID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField',
-        $customFieldID,
-        'option_group_id'
-      );
-    }
-
-    $options = $optionGroupID ? CRM_Core_OptionGroup::valuesByID($optionGroupID) : array();
-
-    CRM_Utils_Hook::customFieldOptions($customFieldID, $options, FALSE);
-
-    return $options;
-  }
-
   /**
    * When changing the value of an option this is called to update all corresponding custom data
    *

diff --git a/CRM/Utils/Rule.php b/CRM/Utils/Rule.php
index ff361257a1619df6ac08ab4f07852353c2efdc9f..c3b483b9218ee0687ae2cc5088b639c7098170a4 100644 (file)
--- a/CRM/Utils/Rule.php
+++ b/CRM/Utils/Rule.php
@@ -737,23 +737,6 @@ class CRM_Utils_Rule {
     return is_dir(Civi::paths()->getPath($path));
   }
 
-  /**
-   * @param $value
-   * @param $options
-   *
-   * @return bool
-   */
-  public static function autocomplete($value, $options) {
-    if ($value) {
-      $selectOption = CRM_Core_BAO_CustomOption::valuesByID($options['fieldID'], $options['optionGroupID']);
-
-      if (!in_array($value, $selectOption)) {
-        return FALSE;
-      }
-    }
-    return TRUE;
-  }
-
   /**
    * @param $value
    * @param null $actualElementValue