From cc9695ea41c755e54302c804d5053f2cbb9d7efd Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 4 Nov 2015 09:44:19 +0100
Subject: [PATCH] Fix typo in variable name
* introduced with #20135 - c6f6a8758b3f08e47c3a8f45a67d09698376b2e2
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"}
---
settings/users.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/settings/users.php b/settings/users.php
index dac649aa82..2795032a16 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -70,7 +70,7 @@ $recoveryAdminEnabled = OC_App::isEnabled('encryption') &&
$config->getAppValue( 'encryption', 'recoveryAdminEnabled', null );
if($isAdmin) {
- $subadmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins();
+ $subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins();
// New class returns IUser[] so convert back
$result = [];
foreach ($subAdmins as $subAdmin) {
@@ -79,7 +79,7 @@ if($isAdmin) {
'uid' => $subAdmin['user']->getUID(),
];
}
- $subadmins = $result;
+ $subAdmins = $result;
}else{
/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
$gids = array();
@@ -88,7 +88,7 @@ if($isAdmin) {
$gids[] = $group['id'];
}
}
- $subadmins = false;
+ $subAdmins = false;
}
// load preset quotas
@@ -108,7 +108,7 @@ $tmpl->assign('groups', $groups);
$tmpl->assign('sortGroups', $sortGroupsBy);
$tmpl->assign('adminGroup', $adminGroup);
$tmpl->assign('isAdmin', (int)$isAdmin);
-$tmpl->assign('subadmins', $subadmins);
+$tmpl->assign('subadmins', $subAdmins);
$tmpl->assign('numofgroups', count($groups) + count($adminGroup));
$tmpl->assign('quota_preset', $quotaPreset);
$tmpl->assign('default_quota', $defaultQuota);
--
GitLab