diff options
| -rw-r--r-- | apps/updatenotification/lib/AppInfo/Application.php | 10 | ||||
| -rw-r--r-- | core/css/header.scss | 3 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | lib/private/Share20/Manager.php | 8 |
4 files changed, 15 insertions, 8 deletions
diff --git a/apps/updatenotification/lib/AppInfo/Application.php b/apps/updatenotification/lib/AppInfo/Application.php index 369b6e3f07d..14512bae838 100644 --- a/apps/updatenotification/lib/AppInfo/Application.php +++ b/apps/updatenotification/lib/AppInfo/Application.php @@ -44,17 +44,17 @@ class Application extends App { return; } + // Always register the notifier, so background jobs (without a user) can send push notifications + $this->registerNotifier(); + $user = $server->getUserSession()->getUser(); if (!$user instanceof IUser) { // Nothing to do for guests return; } - if ($server->getAppManager()->isEnabledForUser('notifications')) { - // Notifications app is available, so we register. - // Since notifications also work for non-admins we don't check this here. - $this->registerNotifier(); - } else if ($server->getGroupManager()->isAdmin($user->getUID())) { + if (!$server->getAppManager()->isEnabledForUser('notifications') && + $server->getGroupManager()->isAdmin($user->getUID())) { try { $updateChecker = $this->getContainer()->query(UpdateChecker::class); } catch (QueryException $e) { diff --git a/core/css/header.scss b/core/css/header.scss index 93b56900f16..46c9083e458 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -112,7 +112,8 @@ } /* Use by the apps menu and the settings right menu */ - ul { + #apps > ul, + &.settings-menu > ul { li { a { display: inline-flex; diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d1f979c6965..9b558b198ee 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -131,7 +131,7 @@ </div> <div id="expandDisplayName" class="icon-settings-white"></div> </div> - <nav id="expanddiv" style="display:none;" + <nav class="settings-menu" id="expanddiv" style="display:none;" aria-label="<?php p($l->t('Settings menu'));?>"> <ul> <?php foreach($_['settingsnavigation'] as $entry):?> diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index d253d6bae4c..38be97746f4 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1408,7 +1408,13 @@ class Manager implements IManager { * @return array */ public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false) { - $owner = $path->getOwner()->getUID(); + $owner = $path->getOwner(); + + if ($owner === null) { + return []; + } + + $owner = $owner->getUID(); if ($currentAccess) { $al = ['users' => [], 'remote' => [], 'public' => false]; |