Merge pull request #4363 from nextcloud/backport/4360/stable31

Author: provokateurin

lib/Folder/FolderManager.php

@@ -488,9 +488,9 @@ private function getCircles(int $id): array {
 	 * app or is member of a group that can manage permissions for the specific folder.
 	 * @throws Exception
 	 */
-	public function canManageACL(int $folderId, IUser $user): bool {
+	public function canManageACL(int $folderId, IUser $user, bool $excludeAdmins = false): bool {
 		$userId = $user->getUId();
-		if ($this->groupManager->isAdmin($userId)) {
+		if (!$excludeAdmins && $this->groupManager->isAdmin($userId)) {
 			return true;
 		}
 

lib/Trash/TrashBackend.php

@@ -443,7 +443,7 @@ private function getTrashForFolders(IUser $user, array $folders): array {
 
 			$trashFolder = $this->rootFolder->get('/' . $user->getUID() . '/files_trashbin/groupfolders/' . $folderId);
 			$content = $trashFolder->getDirectoryListing();
-			$userCanManageAcl = $this->folderManager->canManageACL($folderId, $user);
+			$userCanManageAcl = $this->folderManager->canManageACL($folderId, $user, true);
 			$this->aclManagerFactory->getACLManager($user)->preloadRulesForFolder($this->getUnJailedPath($trashFolder));
 			foreach ($content as $item) {
 				/** @var \OC\Files\Node\Node $item */