MessageTemplate - Don't html-escape the subject

civicrm · Jun 19, 2024 · 73ee3f0 · 73ee3f0
1 parent 6e64b13
commit 73ee3f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CRM/Utils/API/HTMLInputCoder.php b/CRM/Utils/API/HTMLInputCoder.php
@@ -62,6 +62,8 @@ public function getSkipFields() {
         'html_message',
         'body_html',
         'msg_html',
+        // MessageTemplate subject might contain the < character in a smarty tag
+        'msg_subject',
         'description',
         'intro',
         'thankyou_text',

diff --git a/tests/phpunit/api/v4/Entity/MessageTemplateTest.php b/tests/phpunit/api/v4/Entity/MessageTemplateTest.php
@@ -145,7 +145,8 @@ public function testMessageTemplateMasterID(): void {
 
       MessageTemplate::update(FALSE)
         ->addWhere('workflow_name', '=', 'contribution_offline_receipt')
-        ->addValue('msg_html', '<p>Some test {if 1 > 2} markup{/if}</p>')
+        ->addValue('msg_subject', 'Subject test {if 1 > 2} smarty{/if}')
+        ->addValue('msg_html', '<p>Body test {if 1 > 2} markup{/if}</p>')
         ->execute();
 
       $originalTemplate = MessageTemplate::get()
@@ -161,7 +162,8 @@ public function testMessageTemplateMasterID(): void {
         ->execute()->first();
       $messageTemplateIDReserved = $reservedTemplate['id'];
 
-      $this->assertEquals('<p>Some test {if 1 > 2} markup{/if}</p>', $originalTemplate['msg_html']);
+      $this->assertEquals('Subject test {if 1 > 2} smarty{/if}', $originalTemplate['msg_subject']);
+      $this->assertEquals('<p>Body test {if 1 > 2} markup{/if}</p>', $originalTemplate['msg_html']);
       $this->assertNull($originalTemplate['master_id']);
       $this->assertNull($originalTemplate['master_id.msg_subject']);