diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-12-22 10:39:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 10:39:15 +0100 |
| commit | 8f664a00e1e37d8a38ffe0ad2c33c3b64a1ba59c (patch) | |
| tree | 96c3467fc82d0583fc60e939237bf67de77f9d19 /apps | |
| parent | 86066028de3e05f1b521701f756a248233c91b0b (diff) | |
| parent | d498d0982ecbb167bc88745f58dd20e2b0df9da4 (diff) | |
| download | nextcloud-server-8f664a00e1e37d8a38ffe0ad2c33c3b64a1ba59c.tar.gz nextcloud-server-8f664a00e1e37d8a38ffe0ad2c33c3b64a1ba59c.zip | |
Merge pull request #2803 from nextcloud/hide-notification-for-updates
Hide update notification if notification center is enabled
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/updatenotification/appinfo/app.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/updatenotification/appinfo/app.php b/apps/updatenotification/appinfo/app.php index e3010d418bb..3e966fd1276 100644 --- a/apps/updatenotification/appinfo/app.php +++ b/apps/updatenotification/appinfo/app.php @@ -33,7 +33,8 @@ if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) { $userObject = \OC::$server->getUserSession()->getUser(); if($userObject !== null) { - if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID())) { + if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && + !\OC::$server->getAppManager()->isEnabledForUser('notifications')) { if($updateChecker->getUpdateState() !== []) { \OCP\Util::addScript('updatenotification', 'notification'); OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript'); |