refs #4179 save notifications until delivered

1 files changed, 13 insertions, 6 deletions

diff --git a/core/Notification/Manager.php b/core/Notification/Manager.php
index 2fd53a3c50..f35ba0ee93 100644
--- a/core/Notification/Manager.php
+++ b/core/Notification/Manager.php
@@ -34,17 +34,13 @@ class Manager
     {
         self::checkId($id);
 
-        $session = static::getSession();
+        $session      = static::getSession();
         $session->$id = $notification;
-
-        if (Notification::TYPE_PERSISTENT != $notification->type) {
-            $session->setExpirationHops(1, $id);
-        }
     }
 
     public static function getAllNotificationsToDisplay()
     {
-        $session = static::getSession();
+        $session       = static::getSession();
         $notifications = $session->getIterator();
 
         $notifications->uasort(function ($n1, $n2) {
@@ -58,6 +54,17 @@ class Manager
         return $notifications;
     }
 
+    public static function cancelAllNonPersistent()
+    {
+        $session = static::getSession();
+
+        foreach ($session->getIterator() as $key => $notification) {
+            if (Notification::TYPE_PERSISTENT != $notification->type) {
+                unset($session->$key);
+            }
+        }
+    }
+
     /**
      * Cancel a previously registered (or persistent) notification.
      * @param $id