diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-04-30 12:49:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 12:49:57 +0200 |
| commit | 5b5550dbbaa16f29582f630c7e7a8146daa3c76f (patch) | |
| tree | c5b40f6aa824c0df9d1e2367198ca3fdf4fcd5e1 /apps | |
| parent | 2139b29701e89d6559556f770148e3aa7456f8bf (diff) | |
| parent | e24e9ec0a9cf7081eea0f9fd41ac27f29a674c31 (diff) | |
| download | nextcloud-server-5b5550dbbaa16f29582f630c7e7a8146daa3c76f.tar.gz nextcloud-server-5b5550dbbaa16f29582f630c7e7a8146daa3c76f.zip | |
Merge pull request #20677 from nextcloud/followup/17718/scaling-user-provisioning
Scaling user provisioning for subadmins with many groups
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index bd327ffe441..07a1514dd1f 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -504,8 +504,8 @@ class UsersController extends AUserData { } else { // Check if admin / subadmin $subAdminManager = $this->groupManager->getSubAdmin(); - if ($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser) - || $this->groupManager->isAdmin($currentLoggedInUser->getUID())) { + if ($this->groupManager->isAdmin($currentLoggedInUser->getUID()) + || $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) { // They have permissions over the user $permittedFields[] = 'display'; $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME; |