From a5ba1f78033b3ebe69c771fb33c1217a60494728 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
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 <hey@morrisjobke.de>
---
 lib/private/Encryption/Util.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'lib/private/Encryption/Util.php')

diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
index 3afa1bb9596..76e1200a1cb 100644
--- a/lib/private/Encryption/Util.php
+++ b/lib/private/Encryption/Util.php
@@ -273,8 +273,18 @@ class Util {
 			$result = \OCP\User::getUsers();
 		} else {
 			$result = array_merge($result, $users);
+
+			$groupManager = \OC::$server->getGroupManager();
 			foreach ($groups as $group) {
-				$result = array_merge($result, \OC_Group::usersInGroup($group));
+				$groupObject = $groupManager->get($group);
+				if ($groupObject) {
+					$foundUsers = $groupObject->searchUsers('', -1, 0);
+					$userIds = [];
+					foreach ($foundUsers as $user) {
+						$userIds[] = $user->getUID();
+					}
+					$result = array_merge($result, $userIds);
+				}
 			}
 		}
 
-- 
cgit v1.2.3