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 '4.0' into 4.1

Browse Source
This commit is contained in:
Robbie Averill 2018-02-21 14:03:00 +13:00
commit b58c2ef44f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/model/UserDefinedForm.php
View File

@ -6,7 +6,7 @@
class UserDefinedForm extends Page class UserDefinedForm extends Page
{ {
/** /**
* @var string * @var string
*/ */
@ -713,7 +713,7 @@ JS
foreach ($recipients as $recipient) { foreach ($recipients as $recipient) {
$email = new UserFormRecipientEmail($submittedFields); $email = new UserFormRecipientEmail($submittedFields);
$mergeFields = $this->getMergeFieldsMap($emailData['Fields']); $mergeFields = $this->getMergeFieldsMap($emailData['Fields']);
if ($attachments) { if ($attachments) {
foreach ($attachments as $file) { foreach ($attachments as $file) {
if ($file->ID != 0) { if ($file->ID != 0) {
@ -725,7 +725,7 @@ JS
} }
} }
} }
$parsedBody = SSViewer::execute_string($recipient->getEmailBodyContent(), $mergeFields); $parsedBody = SSViewer::execute_string($recipient->getEmailBodyContent(), $mergeFields);
if (!$recipient->SendPlain && $recipient->emailTemplateExists()) { if (!$recipient->SendPlain && $recipient->emailTemplateExists()) {