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

- Updates newsletter router and sending queue worker to work with the

Browse Source 
shortcodes implementation
This commit is contained in:
Vlad
2016-01-26 10:44:18 -05:00
parent 3d6d1a4282
commit b4c8fe6f45
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,8 +53,10 @@ 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, $newsletter, $subscriber); $shortcodes = new Shortcodes($rendered_newsletter['html'], $newsletter, $subscriber);
$processed_newsletter = $shortcodes->replace(); $processed_newsletter['html'] = $shortcodes->replace();
$shortcodes->rendered_newsletter = $rendered_newsletter['text'];
$processed_newsletter['text'] = $shortcodes->replace();
return $processed_newsletter; return $processed_newsletter;
} }

20
lib/Router/Newsletters.php
View File

@ -214,13 +214,13 @@ class Newsletters {
wp_send_json(false); wp_send_json(false);
} }
$renderer = new Renderer($data); $renderer = new Renderer($data);
$rendered_body = $renderer->render(); $rendered_newsletter = $renderer->render();
$shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes( $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
$rendered_body, $rendered_newsletter['html'],
$data $data
); );
$rendered_body = $shortcodes->replace(); $rendered_newsletter = $shortcodes->replace();
wp_send_json(array('rendered_body' => $rendered_body)); wp_send_json(array('rendered_body' => $rendered_newsletter));
} }
function sendPreview($data = array()) { function sendPreview($data = array()) {
@ -242,15 +242,17 @@ class Newsletters {
$newsletter = $newsletter->asArray(); $newsletter = $newsletter->asArray();
$renderer = new Renderer($newsletter); $renderer = new Renderer($newsletter);
$rendered_body = $renderer->render(); $rendered_newsletter = $renderer->render();
$shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes( $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
$rendered_body, $rendered_newsletter['html'],
$newsletter $newsletter
); );
$rendered_body = $shortcodes->replace(); $processed_newsletter['html'] = $shortcodes->replace();
$shortcodes->rendered_newsletter = $rendered_newsletter['text'];
$processed_newsletter['text'] = $shortcodes->replace();
$newsletter['body'] = array( $newsletter['body'] = array(
'html' => $rendered_body, 'html' => $processed_newsletter['html'],
'text' => '', 'text' => $processed_newsletter['text'],
); );
try { try {