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

Merge branch 'standard_scheduling' of mailpoet:mailpoet/mailpoet into standard_scheduling

Browse Source
This commit is contained in:
Vlad
2016-05-18 14:37:11 -04:00
parent 2784bb7282 08a8ca4969
commit 8f935df12a
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Cron/Workers/Scheduler.php
View File

@@ -68,7 +68,7 @@ class Scheduler {
function processPostNotificationNewsletter($newsletter, $queue) {
$immediate_interval =
\MailPoet\Newsletter\Scheduler\Scheduler::INTERVAL_IMMEDIATELY;
$segments = unserialize($newsletter->segments);
$segments = $newsletter->segments()->findArray();
if(empty($segments) && $newsletter->intervalType === $immediate_interval) {
$queue->delete();
return;
@@ -76,7 +76,10 @@ class Scheduler {
self::updateQueueNextRunDate($queue, $newsletter);
return;
}
$subscribers = Subscriber::getSubscribedInSegments($segments)
$segment_ids = array_map(function($segment) {
return $segment['id'];
}, $segments);
$subscribers = Subscriber::getSubscribedInSegments($segment_ids)
->findArray();
$subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id');
$subscribers = array_unique($subscribers);