Merge pull request #32273 from nextcloud/backport/32152/stable24

blizzz · web-flow · commit d81e38d296c6 · 2022-08-04T11:42:56.000+02:00
[stable24] Allow compatibility wrapper on local external storage
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
@@ -157,7 +157,7 @@ private function setupBuiltinWrappers() {
 		});
 
 		Filesystem::addStorageWrapper('oc_encoding', function ($mountPoint, IStorage $storage, IMountPoint $mount) {
-			if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
+			if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
 				return new Encoding(['storage' => $storage]);
 			}
 			return $storage;

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ private function setupBuiltinWrappers() {`
`157`	`157`	`});`
`158`	`158`
`159`	`159`	`Filesystem::addStorageWrapper('oc_encoding', function ($mountPoint, IStorage $storage, IMountPoint $mount) {`
`160`		`- if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {`
	`160`	`+ if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {`
`161`	`161`	`return new Encoding(['storage' => $storage]);`
`162`	`162`	`}`
`163`	`163`	`return $storage;`