diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2017-09-15 14:32:27 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2017-09-15 14:32:27 +0200 |
commit | 6d02fe06c671f788ef548fd90b59816ca047e689 (patch) | |
tree | 3c633677256f24a6cc2f73ce9f04763ce50b17c4 /apps/dav | |
parent | 5896176d69d00843cbe4b2acfb45beaa1de76530 (diff) | |
download | nextcloud-server-6d02fe06c671f788ef548fd90b59816ca047e689.tar.gz nextcloud-server-6d02fe06c671f788ef548fd90b59816ca047e689.zip |
Revert "Do not list system users in contacts menu if sharing autocompletion is disabled"
This reverts commit 56a9084dd2f9a5726a74e1e789773558fade8b44.
Diffstat (limited to 'apps/dav')
-rw-r--r-- | apps/dav/appinfo/app.php | 10 |
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()); }); |