Merge pull request #24484 from nextcloud/backport/24094/stable19

MorrisJobke · web-flow · commit e4bccaf624ef · 2020-12-01T23:03:18.000+01:00
[stable19] Only attempt to move to trash if a file is not in appdata
diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php
@@ -128,7 +128,7 @@ public function rmdir($path) {
 	protected function shouldMoveToTrash($path) {
 		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
 		$parts = explode('/', $normalized);
-		if (count($parts) < 4) {
+		if (count($parts) < 4 || strpos($normalized, '/appdata_') === 0) {
 			return false;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public function rmdir($path) {`
`128`	`128`	`protected function shouldMoveToTrash($path) {`
`129`	`129`	`$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);`
`130`	`130`	`$parts = explode('/', $normalized);`
`131`		`- if (count($parts) < 4) {`
	`131`	`+ if (count($parts) < 4 \|\| strpos($normalized, '/appdata_') === 0) {`
`132`	`132`	`return false;`
`133`	`133`	`}`
`134`	`134`