Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Set newsletter's ID when sending preview or actual newsletter

Browse Source 
[MAILPOET-1882]
This commit is contained in:
Ján Mikláš
2019-03-19 13:53:51 +01:00
committed by M. Shull
parent e2cde798df
commit 5621d1df25
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/API/JSON/v1/Newsletters.php
View File

@ -377,6 +377,7 @@ class Newsletters extends APIEndpoint {
$rendered_newsletter['body']['html'], $rendered_newsletter['body']['html'],
$rendered_newsletter['body']['text'] $rendered_newsletter['body']['text']
) = explode($divider, $shortcodes->replace($body)); ) = explode($divider, $shortcodes->replace($body));
$rendered_newsletter['id'] = $newsletter->id;
try { try {
$mailer = (!empty($data['mailer'])) ? $mailer = (!empty($data['mailer'])) ?

1
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@ -156,6 +156,7 @@ class Newsletter {
} }
$prepared_newsletter = Helpers::splitObject($prepared_newsletter); $prepared_newsletter = Helpers::splitObject($prepared_newsletter);
return array( return array(
'id' => $newsletter->id,
'subject' => $prepared_newsletter[0], 'subject' => $prepared_newsletter[0],
'body' => array( 'body' => array(
'html' => $prepared_newsletter[1], 'html' => $prepared_newsletter[1],