From fb14c58688574321a76acf8eb6c0bc9a1fc7d613 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 21 Dec 2021 20:09:28 -0500
Subject: [PATCH] SearchKit - Fix editable custom fields

---
 .../Civi/Api4/Action/SearchDisplay/AbstractRunAction.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php b/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
index d71beeddbf..e49b718f73 100644
--- a/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
+++ b/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -471,8 +471,8 @@ abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
   private function getEditableInfo($key) {
     [$key] = explode(':', $key);
     $field = $this->getField($key);
-    // If field is an implicit join, use the original fk field
-    if (!empty($field['implicit_join'])) {
+    // If field is an implicit join to another entity (not a custom group), use the original fk field
+    if (!empty($field['implicit_join']) && empty($field['custom_field_id'])) {
       return $this->getEditableInfo(substr($key, 0, -1 - strlen($field['name'])));
     }
     if ($field) {
-- 
2.25.1