tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '6' into 7

Browse Source
This commit is contained in:
github-actions 2024-08-14 08:42:51 +00:00
commit 01dcf8ab1c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Model/EditableFormField/EditableFormHeading.php
View File

@ -70,7 +70,7 @@ class EditableFormHeading extends EditableFormField
public function getFormField() public function getFormField()
{ {
$labelField = HeaderField::create('userforms-header', $this->Title ?: false) $labelField = HeaderField::create('userforms-header-' . $this->ID, $this->Title ?: false)
->setHeadingLevel($this->Level); ->setHeadingLevel($this->Level);
$labelField->addExtraClass('FormHeading'); $labelField->addExtraClass('FormHeading');
$labelField->setAttribute('data-id', $this->Name); $labelField->setAttribute('data-id', $this->Name);

1
code/Model/Recipient/EmailRecipient.php
View File

@ -575,6 +575,7 @@ class EmailRecipient extends DataObject
foreach ($addresses as $address) { foreach ($addresses as $address) {
$trimAddress = trim($address ?? ''); $trimAddress = trim($address ?? '');
if ($trimAddress && !Email::is_valid_address($trimAddress)) { if ($trimAddress && !Email::is_valid_address($trimAddress)) {
/** @phpstan-ignore translation.key (can't simplify the key without lots of duplicated code) */
$error = _t( $error = _t(
__CLASS__.".$translation", __CLASS__.".$translation",
"Invalid email address $trimAddress" "Invalid email address $trimAddress"