diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx index 04beac95f3..8b50caf3c3 100644 --- a/assets/js/src/form/fields/selection.jsx +++ b/assets/js/src/form/fields/selection.jsx @@ -120,7 +120,7 @@ function( getQueues() as $queue) { - $newsletter = Newsletter::findOne($queue->newsletter_id) - ->asArray(); - if(!$newsletter) { + $newsletter = Newsletter::findOne($queue->newsletter_id); + + if($newsletter === false) { + //TODO: delete queue item if newsletter doesn't exist continue; - }; + } else { + $newsletter = $newsletter->asArray(); + } + $mailer = $this->configureMailerForNewsletter($newsletter); $newsletter = $this->renderNewsletter($newsletter); $subscribers = json_decode($queue->subscribers, true); diff --git a/views/settings/basics.html b/views/settings/basics.html index 5b3dfdb5a9..a23dfa175d 100644 --- a/views/settings/basics.html +++ b/views/settings/basics.html @@ -109,7 +109,7 @@ <% for segment in segments %> @@ -239,7 +239,7 @@