summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-09-18 14:25:16 +0200
committerGitHub <noreply@github.com>2017-09-18 14:25:16 +0200
commit8b1eaba417553410871ebec64f78a96cefaa6f6d (patch)
tree627fe613cec575f812389c97615628d7492c30ef /apps
parentf9dc6c456ecdd4802c4e7ed2e1ceb565480ae82f (diff)
parent705432ca6f70b9bcc51132b304ca0ff0a5af0d10 (diff)
downloadnextcloud-server-8b1eaba417553410871ebec64f78a96cefaa6f6d.tar.gz
nextcloud-server-8b1eaba417553410871ebec64f78a96cefaa6f6d.zip
Merge pull request #5585 from nextcloud/contacts_menu_privacy
Enhance privacy of contactsmenu fixes #5107
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/appinfo/app.php10
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php
index 963073c4413..0d417fd3fed 100644
--- a/apps/dav/appinfo/app.php
+++ b/apps/dav/appinfo/app.php
@@ -50,13 +50,7 @@ $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
$cm = \OC::$server->getContactsManager();
$cm->register(function() use ($cm, $app) {
$user = \OC::$server->getUserSession()->getUser();
- if (is_null($user)) {
- return;
+ if (!is_null($user)) {
+ $app->setupContactsProvider($cm, $user->getUID());
}
- if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes') {
- // Don't include system users
- // This prevents user enumeration in the contacts menu and the mail app
- return;
- }
- $app->setupContactsProvider($cm, $user->getUID());
});