Merge pull request #37488 from nextcloud/backport/37448/stable26

[stable26] hide shared files located in group folder's trash bin
This commit is contained in:
Arthur Schiwon 2023-04-03 15:40:24 +02:00 committed by GitHub
commit ca0a258035
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -55,6 +55,7 @@ use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IAttributes;
use OCP\Share\IShare;
use OCP\Share\IShareProvider;
use function str_starts_with;
/**
* Class DefaultShareProvider
@ -885,6 +886,11 @@ class DefaultShareProvider implements IShareProvider {
if ($pathSections[0] !== 'files'
&& (strpos($data['storage_string_id'], 'home::') === 0 || strpos($data['storage_string_id'], 'object::user') === 0)) {
return false;
} elseif ($pathSections[0] === '__groupfolders'
&& str_starts_with($pathSections[1], 'trash/')
) {
// exclude shares leading to trashbin on group folders storages
return false;
}
return true;
}