mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix typo in variable name 

* introduced with #20135 - c6f6a8758b

Fixes following error meessage:

{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Undefined variable: subAdmins at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Invalid argument supplied for foreach() at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
This commit is contained in:
Morris Jobke 2015-11-04 09:44:19 +01:00
parent 7fe047425f
commit cc9695ea41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
settings/users.php
View File

@ -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);