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

- Refactors code

Browse Source
This commit is contained in:
Vlad
2016-01-26 11:29:56 -05:00
parent b4c8fe6f45
commit c11d95b402
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ class SendingQueue {
$rendered_newsletter = $this->renderNewsletter($newsletter); $rendered_newsletter = $this->renderNewsletter($newsletter);
$shortcodes = new Shortcodes($rendered_newsletter['html'], $newsletter, $subscriber); $shortcodes = new Shortcodes($rendered_newsletter['html'], $newsletter, $subscriber);
$processed_newsletter['html'] = $shortcodes->replace(); $processed_newsletter['html'] = $shortcodes->replace();
$shortcodes->rendered_newsletter = $rendered_newsletter['text']; $shortcodes = new Shortcodes($rendered_newsletter['text'], $newsletter, $subscriber);
$processed_newsletter['text'] = $shortcodes->replace(); $processed_newsletter['text'] = $shortcodes->replace();
return $processed_newsletter; return $processed_newsletter;
} }

5
lib/Router/Newsletters.php
View File

@ -248,7 +248,10 @@ class Newsletters {
$newsletter $newsletter
); );
$processed_newsletter['html'] = $shortcodes->replace(); $processed_newsletter['html'] = $shortcodes->replace();
$shortcodes->rendered_newsletter = $rendered_newsletter['text']; $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
$rendered_newsletter['text'],
$newsletter
);
$processed_newsletter['text'] = $shortcodes->replace(); $processed_newsletter['text'] = $shortcodes->replace();
$newsletter['body'] = array( $newsletter['body'] = array(
'html' => $processed_newsletter['html'], 'html' => $processed_newsletter['html'],