Merge pull request #16627 from seamuslee001/aug_custom_fields_fix

[REF] Apply fix for CRM-607 for when building the select section of t…
civicrm · Feb 27, 2020 · 7592d3a · 7592d3a
2 parents 7b6fb49 + 494d81e
commit 7592d3a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CRM/Core/BAO/CustomQuery.php b/CRM/Core/BAO/CustomQuery.php
@@ -198,6 +198,10 @@ public function select() {
     }
 
     foreach (array_keys($this->_ids) as $id) {
+      // Ignore any custom field ids within the ids array that are not present in the fields array.
+      if (empty($this->_fields[$id])) {
+        continue;
+      }
       $field = $this->_fields[$id];
 
       if ($this->_contactSearch && $field['search_table'] === 'contact_a') {