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

- Updates link tracking to use the same Public API data format as other

Browse Source 
endpoints
This commit is contained in:
Vlad
2016-05-02 13:15:48 -04:00
parent a4477a9bd6
commit 3f2199fd63
6 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,7 +118,7 @@ class SendingQueue {
function processBulkSubscribers($mailer, $newsletter, $subscribers, $queue) {
foreach($subscribers as $subscriber) {
$processed_newsletters[] =
$this->processNewsletter($newsletter, $subscriber, $queue);
$this->processNewsletterBeforeSending($newsletter, $subscriber, $queue);
if(!$queue->newsletter_rendered_subject) {
$queue->newsletter_rendered_subject = $processed_newsletters[0]['subject'];
}
@@ -162,7 +162,7 @@ class SendingQueue {
function processIndividualSubscriber($mailer, $newsletter, $subscribers, $queue) {
foreach($subscribers as $subscriber) {
$this->checkSendingLimit();
$processed_newsletter = $this->processNewsletter($newsletter, $subscriber, $queue);
$processed_newsletter = $this->processNewsletterBeforeSending($newsletter, $subscriber, $queue);
if(!$queue->newsletter_rendered_subject) {
$queue->newsletter_rendered_subject = $processed_newsletter['subject'];
}
@@ -213,7 +213,7 @@ class SendingQueue {
return $content;
}
function processNewsletter($newsletter, $subscriber = false, $queue) {
function processNewsletterBeforeSending($newsletter, $subscriber = false, $queue) {
$data_for_shortcodes = array(
$newsletter['subject'],
$newsletter['body']['html'],