From 0d3424f43a1e5dd61b662fc3deb91c3a2919cff3 Mon Sep 17 00:00:00 2001 From: Pavel Dohnal Date: Tue, 19 Nov 2019 13:17:59 +0100 Subject: [PATCH] Use proper checks [MAILPOET-2535] --- lib/Tasks/State.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Tasks/State.php b/lib/Tasks/State.php index dda23d43b7..85cef87abf 100644 --- a/lib/Tasks/State.php +++ b/lib/Tasks/State.php @@ -4,6 +4,7 @@ namespace MailPoet\Tasks; use Carbon\Carbon; use MailPoet\Cron\Workers\Scheduler; +use MailPoet\Models\Newsletter; use MailPoet\Models\ScheduledTask; use MailPoet\Models\SendingQueue; use MailPoet\Newsletter\Url as NewsletterUrl; @@ -81,10 +82,10 @@ class State 'id' => (int)$task->id, 'type' => $task->type, 'priority' => (int)$task->priority, - 'updated_at' => Carbon::createFromTimeString($task->updated_at)->timestamp, + 'updated_at' => Carbon::createFromTimeString((string)$task->updated_at)->timestamp, 'scheduled_at' => $task->scheduled_at ? Carbon::createFromTimeString($task->scheduled_at)->timestamp : null, 'status' => $task->status, - 'newsletter' => $queue && $newsletter ? [ + 'newsletter' => (($queue instanceof SendingQueue) && ($newsletter instanceof Newsletter)) ? [ 'newsletter_id' => (int)$queue->newsletter_id, 'queue_id' => (int)$queue->id, 'subject' => $queue->newsletter_rendered_subject ?: $newsletter->subject,