diff --git a/lib/Cron/Workers/Scheduler.php b/lib/Cron/Workers/Scheduler.php index 1bd53607f6..f108b435c1 100644 --- a/lib/Cron/Workers/Scheduler.php +++ b/lib/Cron/Workers/Scheduler.php @@ -65,15 +65,8 @@ class Scheduler { function processPostNotificationNewsletter($newsletter, $queue) { $next_run_date = $this->getQueueNextRunDate($newsletter->schedule); $segments = unserialize($newsletter->segments); - if((boolean) Setting::getValue('signup_confirmation.enabled')) { - $subscribers = Subscriber::getSubscribedInSegments($segments) - ->findArray(); - } - else { - $subscribers = SubscriberSegment::whereIn('segment_id', $segments) - ->where('status', 'subscribed') - ->findArray(); - } + $subscribers = Subscriber::getSubscribedInSegments($segments) + ->findArray(); $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id'); $subscribers = array_unique($subscribers); if(!count($subscribers) || !$this->checkIfNewsletterChanged($newsletter)) { diff --git a/lib/Router/SendingQueue.php b/lib/Router/SendingQueue.php index c65838a2cb..e414d3e34f 100644 --- a/lib/Router/SendingQueue.php +++ b/lib/Router/SendingQueue.php @@ -84,17 +84,9 @@ class SendingQueue { $queue = \MailPoet\Models\SendingQueue::create(); $queue->newsletter_id = $newsletter->id; - if((boolean) Setting::getValue('signup_confirmation.enabled')) { - $subscribers = Subscriber::getSubscribedInSegments($data['segments']) - ->findArray(); - } - else { - $subscribers = SubscriberSegment::whereIn('segment_id', $data['segments']) - ->where('status', 'subscribed') - ->findArray(); - } + $subscribers = Subscriber::getSubscribedInSegments($data['segments']) + ->findArray(); $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id'); - $subscribers = array_unique($subscribers); if(!count($subscribers)) { return array(