From 6c5d3fc7f219a9e32778b83d0caa2c297a1d38e3 Mon Sep 17 00:00:00 2001
From: Matthew Wire <devel@mrwire.co.uk>
Date: Sat, 7 Jul 2018 22:48:04 +0100
Subject: [PATCH] Allow custom fields of type Select to be defined without
 specifying an option group (so they can be populated dynamically using
 hook_civicrm_fieldOptions

---
 CRM/Core/BAO/CustomField.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index dda021c2e8f5..8dd1a491fc3a 100644
--- 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;