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 126e672d84 into 69548a5c12

Browse Source
This commit is contained in:
Guy Sartorelli 2024-10-17 05:31:24 +13:00 committed by GitHub
commit ebc55632f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/Control/UserDefinedFormController.php
View File

@ -14,6 +14,7 @@ use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Core\Manifest\ModuleLoader;
use SilverStripe\Dev\Deprecation;
use SilverStripe\Forms\Form; use SilverStripe\Forms\Form;
use SilverStripe\i18n\i18n; use SilverStripe\i18n\i18n;
use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\ArrayList;
@ -421,7 +422,9 @@ JS
// Include any parsed merge field references from the CMS editor - this is already escaped // Include any parsed merge field references from the CMS editor - this is already escaped
// This string substitution works for both HTML and plain text emails. // This string substitution works for both HTML and plain text emails.
// $recipient->getEmailBodyContent() will retrieve the relevant version of the email // $recipient->getEmailBodyContent() will retrieve the relevant version of the email
$emailData['Body'] = SSViewer::execute_string($recipient->getEmailBodyContent(), $mergeFields); $emailData['Body'] = Deprecation::withSuppressedNotice(
fn () => SSViewer::execute_string($recipient->getEmailBodyContent(), $mergeFields)
);
// only include visible fields if recipient visibility flag is set // only include visible fields if recipient visibility flag is set
if ((bool) $recipient->HideInvisibleFields) { if ((bool) $recipient->HideInvisibleFields) {
$emailData['Fields'] = $visibleSubmittedFields; $emailData['Fields'] = $visibleSubmittedFields;
@ -487,10 +490,14 @@ JS
if ($submittedFormField && trim($submittedFormField->Value ?? '')) { if ($submittedFormField && trim($submittedFormField->Value ?? '')) {
$email->setSubject($submittedFormField->Value); $email->setSubject($submittedFormField->Value);
} else { } else {
$email->setSubject(SSViewer::execute_string($recipient->EmailSubject, $mergeFields)); $email->setSubject(Deprecation::withSuppressedNotice(
fn () => SSViewer::execute_string($recipient->EmailSubject, $mergeFields)
));
} }
} else { } else {
$email->setSubject(SSViewer::execute_string($recipient->EmailSubject, $mergeFields)); $email->setSubject(Deprecation::withSuppressedNotice(
fn () => SSViewer::execute_string($recipient->EmailSubject, $mergeFields)
));
} }
$this->extend('updateEmail', $email, $recipient, $emailData); $this->extend('updateEmail', $email, $recipient, $emailData);