Encode special characters in list.label.label callback (#170)

fritzmg · web-flow · commit 68e566672733 · 2025-04-10T08:26:55.000+02:00
diff --git a/src/EventListener/DataContainer/LeadLabelListener.php b/src/EventListener/DataContainer/LeadLabelListener.php
@@ -68,10 +68,13 @@ public function __invoke(array $row, string $label): string
         }
 
         if ($this->stringParser) {
-            return $this->stringParser->recursiveReplaceTokensAndTags($lead['leadLabel'], $tokens);
+            $return = $this->stringParser->recursiveReplaceTokensAndTags($lead['leadLabel'], $tokens);
+        } else {
+            $return = \Haste\Util\StringUtil::recursiveReplaceTokensAndTags($lead['leadLabel'], $tokens);
         }
 
-        return \Haste\Util\StringUtil::recursiveReplaceTokensAndTags($lead['leadLabel'], $tokens);
+        // Encode specialchars for the back end view (see terminal42/contao-leads#170)
+        return StringUtil::specialchars($return);
     }
 
     private function formatToken(string $title, int|string $value): string

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,13 @@ public function __invoke(array $row, string $label): string`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if ($this->stringParser) {`
`71`		`- return $this->stringParser->recursiveReplaceTokensAndTags($lead['leadLabel'], $tokens);`
	`71`	`+ $return = $this->stringParser->recursiveReplaceTokensAndTags($lead['leadLabel'], $tokens);`
	`72`	`+ } else {`
	`73`	`+ $return = \Haste\Util\StringUtil::recursiveReplaceTokensAndTags($lead['leadLabel'], $tokens);`
`72`	`74`	`}`
`73`	`75`
`74`		`- return \Haste\Util\StringUtil::recursiveReplaceTokensAndTags($lead['leadLabel'], $tokens);`
	`76`	`+ // Encode specialchars for the back end view (see terminal42/contao-leads#170)`
	`77`	`+ return StringUtil::specialchars($return);`
`75`	`78`	`}`
`76`	`79`
`77`	`80`	`private function formatToken(string $title, int\|string $value): string`