Fix UUIDs when queueing.

laravel · Oct 24, 2016 · 18d26df · 18d26df
1 parent e209d1a
commit 18d26df
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Illuminate/Notifications/ChannelManager.php b/src/Illuminate/Notifications/ChannelManager.php
@@ -68,7 +68,9 @@ public function sendNow($notifiables, $notification, array $channels = null)
             foreach ($channels as $channel) {
                 $notification = clone $original;
 
-                $notification->id = $notificationId;
+                if (! $notification->id) {
+                    $notification->id = $notificationId;
+                }
 
                 if (! $this->shouldSendNotification($notifiable, $notification, $channel)) {
                     continue;
@@ -111,8 +113,16 @@ protected function queueNotification($notifiables, $notification)
 
         $bus = $this->app->make(Bus::class);
 
+        $original = clone $notification;
+
         foreach ($notifiables as $notifiable) {
+            $notificationId = (string) Uuid::uuid4();
+
             foreach ($notification->via($notifiable) as $channel) {
+                $notification = clone $original;
+
+                $notification->id = $notificationId;
+
                 $bus->dispatch(
                     (new SendQueuedNotifications($this->formatNotifiables($notifiable), $notification, [$channel]))
                             ->onConnection($notification->connection)