diff --git a/ProcessMaker/Models/ProcessRequest.php b/ProcessMaker/Models/ProcessRequest.php
index 3424d0ab6f..173d9a81d1 100644
--- a/ProcessMaker/Models/ProcessRequest.php
+++ b/ProcessMaker/Models/ProcessRequest.php
@@ -1098,7 +1098,13 @@ public function evaluateCaseTitle(string $mustacheTitle, array $data, bool $form
$len += mb_strlen($part);
}
} else {
- $mustache = new MustacheExpressionEvaluator();
+ $mustache = new MustacheExpressionEvaluator([
+ 'escape' => function ($value) {
+ return is_scalar($value) || $value === null
+ ? (string) $value
+ : '';
+ },
+ ]);
$title = $mustache->render($mustacheTitle, $data);
// multi-byte 200 characters limit
$title = mb_substr($title, 0, 200);
diff --git a/tests/unit/ProcessMaker/CaseTitleTest.php b/tests/unit/ProcessMaker/CaseTitleTest.php
index 6838a7d2f8..aa16ca6eb5 100644
--- a/tests/unit/ProcessMaker/CaseTitleTest.php
+++ b/tests/unit/ProcessMaker/CaseTitleTest.php
@@ -16,6 +16,18 @@ public function testEvaluateCaseTitleWithoutFormatting()
$this->assertEquals('Hello, World!', $title);
}
+ public function testEvaluateCaseTitleWithoutFormattingPreservesAmpersand()
+ {
+ $processRequest = new ProcessRequest();
+ $title = $processRequest->evaluateCaseTitle(
+ 'Research {{department}}',
+ ['department' => 'Research & Development'],
+ false
+ );
+
+ $this->assertSame('Research Research & Development', $title);
+ }
+
public function testEvaluateCaseTitleWithFormatting()
{
$processRequest = new ProcessRequest();
@@ -24,6 +36,18 @@ public function testEvaluateCaseTitleWithFormatting()
$this->assertEquals('Hello, World!', $title);
}
+ public function testEvaluateCaseTitleWithFormattingEscapesAmpersandForHtml()
+ {
+ $processRequest = new ProcessRequest();
+ $title = $processRequest->evaluateCaseTitle(
+ 'Research {{department}}',
+ ['department' => 'Research & Development'],
+ true
+ );
+
+ $this->assertSame('Research Research & Development', $title);
+ }
+
public function testEvaluateCaseTitleWithCharacterLimit()
{
$processRequest = new ProcessRequest();