Skip to content

Commit 11a19ad

Browse files
Merge pull request #45012 from nextcloud/backport/45010/stable21
[stable21] fix(files): Also skip cross storage move with access control
2 parents 646cba4 + 2986019 commit 11a19ad

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

lib/private/Files/Storage/Local.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,10 @@ public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
528528
// Don't treat ACLStorageWrapper like local storage where copy can be done directly.
529529
// Instead use the slower recursive copying in php from Common::copyFromStorage with
530530
// more permissions checks.
531-
if ($sourceStorage->instanceOfStorage(Local::class) && !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper')) {
531+
/** @psalm-suppress UndefinedClass */
532+
if ($sourceStorage->instanceOfStorage(Local::class)
533+
&& !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper')
534+
&& !$sourceStorage->instanceOfStorage(\OCA\FilesAccessControl\StorageWrapper::class)) {
532535
if ($sourceStorage->instanceOfStorage(Jail::class)) {
533536
/**
534537
* @var \OC\Files\Storage\Wrapper\Jail $sourceStorage

0 commit comments

Comments
 (0)