From a5ba1f78033b3ebe69c771fb33c1217a60494728 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 3 Mar 2017 01:24:27 -0600 Subject: Remove legacy class OC_Group and OC_User * basically a straight replacement of the wrapped code at the calling code parts Signed-off-by: Morris Jobke --- lib/private/legacy/user.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/private/legacy/user.php') diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index 661242a659a..621ea3535b1 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -333,7 +333,9 @@ class OC_User { * @return bool */ public static function isAdminUser($uid) { - if (OC_Group::inGroup($uid, 'admin') && self::$incognitoMode === false) { + $group = \OC::$server->getGroupManager()->get('admin'); + $user = \OC::$server->getUserManager()->get($uid); + if ($group && $user && $group->inGroup($user) && self::$incognitoMode === false) { return true; } return false; -- cgit v1.2.3