EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Ref
Yurii23244f037ab4
diff --git a/application/Espo/Tools/EmailTemplate/Processor.php b/application/Espo/Tools/EmailTemplate/Processor.phpindex 1528f88822..c222f8ee6f 100644--- a/application/Espo/Tools/EmailTemplate/Processor.php+++ b/application/Espo/Tools/EmailTemplate/Processor.php@@ -130,15 +130,12 @@ class Processor);}+ $this->processPlaceholders($pairs, $data);+ $this->processCleanup($pairs);+$subject = strtr($subject, $pairs);$body = strtr($body, $pairs);- $subject = $this->processPlaceholders($subject, $data);- $body = $this->processPlaceholders($body, $data);-- $subject = $this->processCleanup($subject);- $body = $this->processCleanup($body);-$attachmentList = $params->copyAttachments() ?$this->copyAttachments($template) : [];@@ -149,18 +146,17 @@ class ProcessorattachmentList: $attachmentList,);}+ /**+ * @param array<string, string> $pairs+ */- private function processPlaceholders(string $text, Data $data): string+ private function processPlaceholders(array &$pairs, Data $data): void{- $pairs = [];-foreach ($this->placeholdersProvider->get() as [$key, $placeholder]) {$from = '{' . $key . '}';$pairs[$from] = $placeholder->get($data);}-- return strtr($text, $pairs);}/**@@ -489,14 +485,17 @@ class Processorreturn [$entityHash, $data];}- private function processCleanup(string $text): string+ /**+ * @param array<string, string> $pairs+ */+ private function processCleanup(array &$pairs): void{- $pairs = [];-foreach ($this->stripPlaceholderList as $item) {+ if (array_key_exists($item, $pairs)) {+ continue;+ }+$pairs[$item] = '';}-- return strtr($text, $pairs);}}