Allow custom fields of type Select to be defined without specifying a…

…n option group (so they can be populated dynamically using hook_civicrm_fieldOptions
civicrm · Jul 23, 2018 · 6c5d3fc · 6c5d3fc
1 parent 1627fe6
commit 6c5d3fc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
@@ -402,6 +402,9 @@ public function getOptions($context = NULL) {
       $this->find(TRUE);
     }
 
+    // This will hold the list of options in format key => label
+    $options = [];
+
     if (!empty($this->option_group_id)) {
       $options = CRM_Core_OptionGroup::valuesByID(
         $this->option_group_id,
@@ -421,9 +424,6 @@ public function getOptions($context = NULL) {
     elseif ($this->data_type === 'Boolean') {
       $options = $context == 'validate' ? array(0, 1) : CRM_Core_SelectValues::boolean();
     }
-    else {
-      return FALSE;
-    }
     CRM_Utils_Hook::customFieldOptions($this->id, $options, FALSE);
     CRM_Utils_Hook::fieldOptions($this->getEntity(), "custom_{$this->id}", $options, array('context' => $context));
     return $options;