diff --git a/ProcessMaker/Models/ProcessRequest.php b/ProcessMaker/Models/ProcessRequest.php
index 3424d0ab6f..35c3a2b91d 100644
--- a/ProcessMaker/Models/ProcessRequest.php
+++ b/ProcessMaker/Models/ProcessRequest.php
@@ -1076,29 +1076,15 @@ public function evaluateCaseTitle(string $mustacheTitle, array $data, bool $form
]);
$title = $mustache->render($mustacheTitle, $data);
// multi-byte 200 characters limit
- $titleParts = preg_split('/(|<\/b>)/', $title, -1, PREG_SPLIT_DELIM_CAPTURE);
- $title = '';
- $size = 200;
- $len = 0;
- foreach ($titleParts as $i => $part) {
- if ($part === '' || $part === '') {
- $title .= $part;
- continue;
- }
- if ($len + mb_strlen($part) >= $size) {
- $part = mb_substr($part, 0, $size - $len);
- $title .= $part;
- $nextPart = $titleParts[$i + 1] ?? '';
- if ($nextPart === '') {
- $title .= $nextPart;
- }
- break;
- }
- $title .= $part;
- $len += mb_strlen($part);
- }
+ $title = $this->truncateFormattedCaseTitle($title);
} 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);
@@ -1107,6 +1093,32 @@ public function evaluateCaseTitle(string $mustacheTitle, array $data, bool $form
return $title;
}
+ private function truncateFormattedCaseTitle(string $renderedTitle, int $size = 200): string
+ {
+ $titleParts = preg_split('/(|<\/b>)/', $renderedTitle, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $title = '';
+ $len = 0;
+ foreach ($titleParts as $i => $part) {
+ if ($part === '' || $part === '') {
+ $title .= $part;
+ continue;
+ }
+ if ($len + mb_strlen($part) >= $size) {
+ $part = mb_substr($part, 0, $size - $len);
+ $title .= $part;
+ $nextPart = $titleParts[$i + 1] ?? '';
+ if ($nextPart === '') {
+ $title .= $nextPart;
+ }
+ break;
+ }
+ $title .= $part;
+ $len += mb_strlen($part);
+ }
+
+ return $title;
+ }
+
public function isSystem()
{
$systemCategories = ProcessCategory::where('is_system', true)->pluck('id');
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();