Make sure generated element ID contains only alphanumeric plus dash

jissereitsma · jissereitsma · commit 34302eb353d3 · 2025-11-26T14:51:45.000+01:00
diff --git a/Util/Block/AbstractRenderer.php b/Util/Block/AbstractRenderer.php
@@ -71,10 +71,11 @@ protected function setNameInLayout(AbstractBlock $block): void
 
     protected function getUniqId(AbstractBlock $block, array $data = []): string
     {
-        $ancestorId = $this->ancestorBlock->getNameInLayout();
+        $ancestorId = preg_replace('/([^a-zA-Z0-9\-]+)/', '-', $this->ancestorBlock->getNameInLayout());
 
         if (isset($data['uniq'])) {
-            return $ancestorId . '-' . $data['uniq'];
+            $uniq = preg_replace('/([^a-zA-Z0-9\-]+)/', '-', $data['uniq']);
+            return $ancestorId . '-' . $uniq;
         }
 
         $blockParts = explode('.', $block->getNameInLayout());

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,11 @@ protected function setNameInLayout(AbstractBlock $block): void`
`71`	`71`
`72`	`72`	`protected function getUniqId(AbstractBlock $block, array $data = []): string`
`73`	`73`	`{`
`74`		`- $ancestorId = $this->ancestorBlock->getNameInLayout();`
	`74`	`+ $ancestorId = preg_replace('/([^a-zA-Z0-9\-]+)/', '-', $this->ancestorBlock->getNameInLayout());`
`75`	`75`
`76`	`76`	`if (isset($data['uniq'])) {`
`77`		`- return $ancestorId . '-' . $data['uniq'];`
	`77`	`+ $uniq = preg_replace('/([^a-zA-Z0-9\-]+)/', '-', $data['uniq']);`
	`78`	`+ return $ancestorId . '-' . $uniq;`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`$blockParts = explode('.', $block->getNameInLayout());`