Merge branch 'iamgergo/8.x' into 8.x

laravel · Nov 19, 2020 · c054535 · c054535
2 parents 1a552b7 + 27b4a76
commit c054535
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Illuminate/Notifications/NotificationSender.php b/src/Illuminate/Notifications/NotificationSender.php
@@ -202,7 +202,10 @@ protected function queueNotification($notifiables, $notification)
                     (new SendQueuedNotifications($notifiable, $notification, [$channel]))
                             ->onConnection($notification->connection)
                             ->onQueue($queue)
-                            ->delay($notification->delay)
+                            ->delay(is_array($notification->delay) ?
+                                    ($notification->delay[$channel] ?? null)
+                                    : $notification->delay
+                            )
                             ->through(
                                 array_merge(
                                     method_exists($notification, 'middleware') ? $notification->middleware() : [],