diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-11-19 22:29:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 22:29:23 +0100 |
| commit | bf23555b8b93ac883e9b80e0df23084b6dc03f21 (patch) | |
| tree | f190024cf0688e2f2d697d9f66c4af6493768264 /apps/files_trashbin | |
| parent | 33bceacc824a0770b3b66df3241696dff8b3ea20 (diff) | |
| parent | f4b036f249344b7f82183199154f444ea3b0b911 (diff) | |
| download | nextcloud-server-bf23555b8b93ac883e9b80e0df23084b6dc03f21.tar.gz nextcloud-server-bf23555b8b93ac883e9b80e0df23084b6dc03f21.zip | |
Merge pull request #24094 from nextcloud/bugfix/noid/trash-appdata
Only attempt to move to trash if a file is not in appdata
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/Storage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php index 2064b7d664f..806ce218772 100644 --- a/apps/files_trashbin/lib/Storage.php +++ b/apps/files_trashbin/lib/Storage.php @@ -128,7 +128,7 @@ class Storage extends Wrapper { 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; } |