diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-15 04:52:54 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-15 04:52:54 +0400 |
commit | c333b1a63c9c0316ba9458235df18eb0a0463c0d (patch) | |
tree | bf7622291ce8e43579bb3c4ddbf9f5de95217ba3 /core/Plugin/ControllerAdmin.php | |
parent | e5c0c331d7ad900955f8eee6f4a6a599fd6aa779 (diff) |
in case notifications are already assigned to the view, do not overwrite them as there will be always none otherwise
Diffstat (limited to 'core/Plugin/ControllerAdmin.php')
-rw-r--r-- | core/Plugin/ControllerAdmin.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php index 56051341ab..4f8f885ef9 100644 --- a/core/Plugin/ControllerAdmin.php +++ b/core/Plugin/ControllerAdmin.php @@ -178,8 +178,11 @@ abstract class ControllerAdmin extends Controller $adminMenu = MenuAdmin::getInstance()->getMenu(); $view->adminMenu = $adminMenu; - $view->notifications = NotificationManager::getAllNotificationsToDisplay(); - NotificationManager::cancelAllNonPersistent(); + $notifications = $view->notifications; + if (empty($notifications)) { + $view->notifications = NotificationManager::getAllNotificationsToDisplay(); + NotificationManager::cancelAllNonPersistent(); + } } static public function isDataPurgeSettingsEnabled() |