Skip to content
Snippets Groups Projects
Commit cc9695ea authored by Morris Jobke's avatar Morris Jobke
Browse files

Fix typo in variable name

* introduced with #20135 - c6f6a875

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"}
parent 7fe04742
No related branches found
No related tags found
No related merge requests found
...@@ -70,7 +70,7 @@ $recoveryAdminEnabled = OC_App::isEnabled('encryption') && ...@@ -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) { ...@@ -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) { ...@@ -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); ...@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment