Merge branch '6.2' into 6

silverstripe · Aug 14, 2024 · 4c23cad · 4c23cad
2 parents 86c7eed + f5cfc22
commit 4c23cad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/code/Model/EditableFormField/EditableFormHeading.php b/code/Model/EditableFormField/EditableFormHeading.php
@@ -70,7 +70,7 @@ public function getCMSFields()
 
     public function getFormField()
     {
-        $labelField = HeaderField::create('userforms-header', $this->Title ?: false)
+        $labelField = HeaderField::create('userforms-header-' . $this->ID, $this->Title ?: false)
             ->setHeadingLevel($this->Level);
         $labelField->addExtraClass('FormHeading');
         $labelField->setAttribute('data-id', $this->Name);

diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
@@ -575,6 +575,7 @@ public function validate()
                 foreach ($addresses as $address) {
                     $trimAddress = trim($address ?? '');
                     if ($trimAddress && !Email::is_valid_address($trimAddress)) {
+                        /** @phpstan-ignore translation.key (can't simplify the key without lots of duplicated code) */
                         $error = _t(
                             __CLASS__.".$translation",
                             "Invalid email address $trimAddress"