]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix(files): Also skip cross storage move with access control 45012/head
authorJoas Schilling <coding@schilljs.com>
Wed, 24 Apr 2024 09:38:46 +0000 (11:38 +0200)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Wed, 24 Apr 2024 09:42:33 +0000 (09:42 +0000)
Signed-off-by: Joas Schilling <coding@schilljs.com>
lib/private/Files/Storage/Local.php

index 22c9418d19faad779db5219b0455016d036895c9..cb6672e35a0234fc028cdc92a27c95ddf09306ab 100644 (file)
@@ -528,7 +528,10 @@ class Local extends \OC\Files\Storage\Common {
                // Don't treat ACLStorageWrapper like local storage where copy can be done directly.
                // Instead use the slower recursive copying in php from Common::copyFromStorage with
                // more permissions checks.
-               if ($sourceStorage->instanceOfStorage(Local::class) && !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper')) {
+               /** @psalm-suppress UndefinedClass */
+               if ($sourceStorage->instanceOfStorage(Local::class)
+                       && !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper')
+                       && !$sourceStorage->instanceOfStorage(\OCA\FilesAccessControl\StorageWrapper::class)) {
                        if ($sourceStorage->instanceOfStorage(Jail::class)) {
                                /**
                                 * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage