From 4817275f4efb05b3f22eabf4d0c1dddfa91fb30b Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 23 Jul 2015 14:33:58 +0930 Subject: [PATCH] Notification one-per-user limit should work between instances --- .../Core/Notifications/NotificationSyncer.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/framework/core/src/Core/Notifications/NotificationSyncer.php b/framework/core/src/Core/Notifications/NotificationSyncer.php index 71943320c..f243707a2 100644 --- a/framework/core/src/Core/Notifications/NotificationSyncer.php +++ b/framework/core/src/Core/Notifications/NotificationSyncer.php @@ -17,14 +17,14 @@ class NotificationSyncer * * @var bool */ - protected $onePerUser = false; + protected static $onePerUser = false; /** * An internal list of user IDs that notifications have been sent to. * * @var int[] */ - protected $sentTo = []; + protected static $sentTo = []; /** * @var NotificationRepository @@ -80,9 +80,9 @@ class NotificationSyncer if ($existing) { $toUndelete[] = $existing->id; $toDelete->forget($toDelete->search($existing)); - } elseif (! $this->onePerUser || ! in_array($user->id, $this->sentTo)) { + } elseif (! static::$onePerUser || ! in_array($user->id, static::$sentTo)) { $newRecipients[] = $user; - $this->sentTo[] = $user->id; + static::$sentTo[] = $user->id; } } @@ -136,12 +136,12 @@ class NotificationSyncer */ public function onePerUser(callable $callback) { - $this->sentTo = []; - $this->onePerUser = true; + static::$sentTo = []; + static::$onePerUser = true; $callback(); - $this->onePerUser = false; + static::$onePerUser = false; } /** @@ -169,7 +169,7 @@ class NotificationSyncer ); if ($blueprint instanceof MailableBlueprint) { - $this->mailNotifications($blueprint); + $this->mailNotifications($blueprint, $recipients); } }