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

Merge pull request #1556 from mailpoet/arrays-to-objects

Browse Source 
Replace entity arrays with objects [MAILPOET-1495]
This commit is contained in:
M. Shull
2018-10-22 14:59:12 -04:00
committed by GitHub
parent 78821a69ab c3481dd4b7
commit 1e7542848a
19 changed files with 100 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/API/JSON/v1/NewsletterTemplates.php
View File

@@ -46,8 +46,7 @@ class NewsletterTemplates extends APIEndpoint {
if(!empty($data['newsletter_id'])) {
$template = NewsletterTemplate::whereEqual('newsletter_id', $data['newsletter_id'])->findOne();
if(!empty($template)) {
$template = $template->asArray();
$data['id'] = $template['id'];
$data['id'] = $template->id;
}
}

2
lib/API/JSON/v1/SendingQueue.php
View File

@@ -73,7 +73,7 @@ class SendingQueue extends APIEndpoint {
$queue->status = SendingQueueModel::STATUS_SCHEDULED;
$queue->scheduled_at = Scheduler::formatDatetimeString($newsletter->scheduledAt);
} else {
$segments = $newsletter->segments()->findArray();
$segments = $newsletter->segments()->findMany();
$finder = new SubscribersFinder();
$subscribers_count = $finder->addSubscribersToTaskFromSegments($queue->task(), $segments);
if(!$subscribers_count) {