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

- Removes check for signup confirmation when selecting subscribers

Browse Source
This commit is contained in:
Vlad
2016-04-18 08:45:38 -04:00
parent 0ca0a7d029
commit d2bc0fd24a
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,15 +65,8 @@ class Scheduler {
function processPostNotificationNewsletter($newsletter, $queue) { function processPostNotificationNewsletter($newsletter, $queue) {
$next_run_date = $this->getQueueNextRunDate($newsletter->schedule); $next_run_date = $this->getQueueNextRunDate($newsletter->schedule);
$segments = unserialize($newsletter->segments); $segments = unserialize($newsletter->segments);
if((boolean) Setting::getValue('signup_confirmation.enabled')) { $subscribers = Subscriber::getSubscribedInSegments($segments)
$subscribers = Subscriber::getSubscribedInSegments($segments) ->findArray();
->findArray();
}
else {
$subscribers = SubscriberSegment::whereIn('segment_id', $segments)
->where('status', 'subscribed')
->findArray();
}
$subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id'); $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id');
$subscribers = array_unique($subscribers); $subscribers = array_unique($subscribers);
if(!count($subscribers) || !$this->checkIfNewsletterChanged($newsletter)) { if(!count($subscribers) || !$this->checkIfNewsletterChanged($newsletter)) {

12
lib/Router/SendingQueue.php
View File

@@ -84,17 +84,9 @@ class SendingQueue {
$queue = \MailPoet\Models\SendingQueue::create(); $queue = \MailPoet\Models\SendingQueue::create();
$queue->newsletter_id = $newsletter->id; $queue->newsletter_id = $newsletter->id;
if((boolean) Setting::getValue('signup_confirmation.enabled')) { $subscribers = Subscriber::getSubscribedInSegments($data['segments'])
$subscribers = Subscriber::getSubscribedInSegments($data['segments']) ->findArray();
->findArray();
}
else {
$subscribers = SubscriberSegment::whereIn('segment_id', $data['segments'])
->where('status', 'subscribed')
->findArray();
}
$subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id'); $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id');
$subscribers = array_unique($subscribers); $subscribers = array_unique($subscribers);
if(!count($subscribers)) { if(!count($subscribers)) {
return array( return array(