Merge branch '4.0' into 4.1
This commit is contained in:
commit
b58c2ef44f
|
@ -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()) {
|
||||||
|
|
Loading…
Reference in New Issue