From 82423d60bbc5356c71710247b2ee3deb6a9387af Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 20 Oct 2021 14:06:28 -0600 Subject: [PATCH] Api: Fix cf sub-entry placeholder expansion was not passing content for placeholders like {{#customer/n_fn}} --- api/src/Storage/Merge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index 84169ed6c2..7d87b20095 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -1723,7 +1723,7 @@ abstract class Merge { // If we send the real content it can result in infinite loop of lookups // so we send only the used fields - $content = $expand_sub_cfs[$field] ? $expand_sub_cfs[$field] : ''; + $content = $expand_sub_cfs[$field] ?? $matches[0][$index]; $app_replacements[$field] = $this->get_app_replacements($field_app, $values['#' . $field], $content); } $replacements[$placeholders[$index]] = $app_replacements[$field]['$$' . $sub[$index] . '$$'];