Merge pull request #20283 from owncloud/fix-varaible-type
Fix typo in variable name
This commit is contained in:
commit
475b52c93b
|
@ -70,7 +70,7 @@ $recoveryAdminEnabled = OC_App::isEnabled('encryption') &&
|
||||||
$config->getAppValue( 'encryption', 'recoveryAdminEnabled', null );
|
$config->getAppValue( 'encryption', 'recoveryAdminEnabled', null );
|
||||||
|
|
||||||
if($isAdmin) {
|
if($isAdmin) {
|
||||||
$subadmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins();
|
$subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins();
|
||||||
// New class returns IUser[] so convert back
|
// New class returns IUser[] so convert back
|
||||||
$result = [];
|
$result = [];
|
||||||
foreach ($subAdmins as $subAdmin) {
|
foreach ($subAdmins as $subAdmin) {
|
||||||
|
@ -79,7 +79,7 @@ if($isAdmin) {
|
||||||
'uid' => $subAdmin['user']->getUID(),
|
'uid' => $subAdmin['user']->getUID(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
$subadmins = $result;
|
$subAdmins = $result;
|
||||||
}else{
|
}else{
|
||||||
/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
|
/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
|
||||||
$gids = array();
|
$gids = array();
|
||||||
|
@ -88,7 +88,7 @@ if($isAdmin) {
|
||||||
$gids[] = $group['id'];
|
$gids[] = $group['id'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$subadmins = false;
|
$subAdmins = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// load preset quotas
|
// load preset quotas
|
||||||
|
@ -108,7 +108,7 @@ $tmpl->assign('groups', $groups);
|
||||||
$tmpl->assign('sortGroups', $sortGroupsBy);
|
$tmpl->assign('sortGroups', $sortGroupsBy);
|
||||||
$tmpl->assign('adminGroup', $adminGroup);
|
$tmpl->assign('adminGroup', $adminGroup);
|
||||||
$tmpl->assign('isAdmin', (int)$isAdmin);
|
$tmpl->assign('isAdmin', (int)$isAdmin);
|
||||||
$tmpl->assign('subadmins', $subadmins);
|
$tmpl->assign('subadmins', $subAdmins);
|
||||||
$tmpl->assign('numofgroups', count($groups) + count($adminGroup));
|
$tmpl->assign('numofgroups', count($groups) + count($adminGroup));
|
||||||
$tmpl->assign('quota_preset', $quotaPreset);
|
$tmpl->assign('quota_preset', $quotaPreset);
|
||||||
$tmpl->assign('default_quota', $defaultQuota);
|
$tmpl->assign('default_quota', $defaultQuota);
|
||||||
|
|
Loading…
Reference in New Issue