Browse Source
Merge pull request #48532 from nextcloud/fix/48437/dont-exclude-user
fix: do not reduce count for subadmins if they are members of group
pull/48573/head
Arthur Schiwon
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
0 additions and
6 deletions
-
apps/settings/lib/Controller/UsersController.php
|
|
@ -154,12 +154,6 @@ class UsersController extends Controller { |
|
|
|
foreach ($groups as $key => $group) { |
|
|
|
// $userCount += (int)$group['usercount'];
|
|
|
|
$groupsIds[] = $group['id']; |
|
|
|
// we prevent subadmins from looking up themselves
|
|
|
|
// so we lower the count of the groups he belongs to
|
|
|
|
if (array_key_exists($group['id'], $userGroups)) { |
|
|
|
$groups[$key]['usercount']--; |
|
|
|
$userCount -= 1; // we also lower from one the total count
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
$userCount += $this->userManager->countUsersOfGroups($groupsInfo->getGroups()); |
|
|
|