Skip to content

[stable32] fix(trash): Hide trash from admins #4365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 1 commit into from
Feb 10, 2026
Merged

[stable32] fix(trash): Hide trash from admins #4365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Folder/FolderManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,9 +463,9 @@ private function getCircles(int $id): array {
*
* @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;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Trash/TrashBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ private function getTrashForFolders(IUser $user, array $folders): array {
// we apply acl filtering later to get the correct permissions again
$trashFolder = $this->setupTrashFolder($folder);
$content = $trashFolder->getDirectoryListing();
$userCanManageAcl = $this->folderManager->canManageACL($folder->id, $user);
$userCanManageAcl = $this->folderManager->canManageACL($folder->id, $user, true);
$this->aclManagerFactory->getACLManager($user)->preloadRulesForFolder($folder->storageId, $trashFolder->getId());

$itemsForFolder = array_map(function (Node $item) use ($user, $folder, $indexedRows) {
Expand Down
Loading