From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 27 Apr 2021 03:00:23 +0000 (-0400)
Subject: SearchKit - Exclude serialized fields from implicit join selection
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c877887e7cfdfe8efae112e5c977e83ff3dd65c5;p=civicrm-core.git

SearchKit - Exclude serialized fields from implicit join selection
---

diff --git a/ext/search_kit/Civi/Search/Admin.php b/ext/search_kit/Civi/Search/Admin.php
index ac5d8fa916..b516429806 100644
--- a/ext/search_kit/Civi/Search/Admin.php
+++ b/ext/search_kit/Civi/Search/Admin.php
@@ -123,7 +123,7 @@ class Admin {
     foreach ($schema as &$entity) {
       if (in_array('DAOEntity', $entity['type'], TRUE) && !in_array('EntityBridge', $entity['type'], TRUE)) {
         foreach (array_reverse($entity['fields'], TRUE) as $index => $field) {
-          if (!empty($field['fk_entity']) && !$field['options'] && !empty($schema[$field['fk_entity']]['label_field'])) {
+          if (!empty($field['fk_entity']) && !$field['options'] && empty($field['serialize']) && !empty($schema[$field['fk_entity']]['label_field'])) {
             $isCustom = strpos($field['name'], '.');
             // Custom fields: append "Contact ID" to original field label
             if ($isCustom) {