From 047b86f38b871bc933d320331c541d114aba8ac4 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 13 Oct 2021 08:39:23 -0600 Subject: [PATCH] Placeholders list common UI: different recursion check for better results This one still puts simple customfields in, but just skips the linked apps cfs --- api/src/Storage/Merge.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index d08ab3b624..3902ddb192 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -3079,15 +3079,10 @@ abstract class Merge */ protected function add_customfield_placeholders(&$placeholders, $prefix = '') { - // Avoid recursing between custom fields of different apps - if(substr_count($prefix, '#') > 1) - { - return; - } - foreach(Customfields::get($this->get_app()) as $name => $field) { - if(array_key_exists($field['type'], Api\Link::app_list())) + // Avoid recursing between custom fields of different apps + if(array_key_exists($field['type'], Api\Link::app_list()) && substr_count($prefix, '#') == 0) { $app = self::get_app_class($field['type']); if($app)