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

- Fixes issue with the sending worker failing to process newsletters

Browse Source
This commit is contained in:
Vlad
2016-01-28 21:40:30 -05:00
parent b5094f568c
commit 63c87f3746
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Cron/Workers/SendingQueue.php
View File

@@ -53,10 +53,11 @@ class SendingQueue {
function processNewsletter($newsletter, $subscriber) { function processNewsletter($newsletter, $subscriber) {
$rendered_newsletter = $this->renderNewsletter($newsletter); $rendered_newsletter = $this->renderNewsletter($newsletter);
$shortcodes = new Shortcodes($rendered_newsletter['html'], $newsletter, $subscriber); $shortcodes = new Shortcodes($rendered_newsletter['body']['html'], $newsletter, $subscriber);
$processed_newsletter['html'] = $shortcodes->replace(); $processed_newsletter['body']['html'] = $shortcodes->replace();
$shortcodes = new Shortcodes($rendered_newsletter['text'], $newsletter, $subscriber); $shortcodes = new Shortcodes($rendered_newsletter['body']['text'], $newsletter, $subscriber);
$processed_newsletter['text'] = $shortcodes->replace(); $processed_newsletter['body']['text'] = $shortcodes->replace();
$processed_newsletter['subject'] = $rendered_newsletter['subject'];
return $processed_newsletter; return $processed_newsletter;
} }
@@ -130,7 +131,7 @@ class SendingQueue {
} }
function renderNewsletter($newsletter) { function renderNewsletter($newsletter) {
$renderer = new Renderer(json_decode($newsletter['body'], true)); $renderer = new Renderer($newsletter);
$newsletter['body'] = $renderer->render(); $newsletter['body'] = $renderer->render();
return $newsletter; return $newsletter;
} }