diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-17 14:51:08 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-17 14:51:08 +0200 |
| commit | 99c62dfd768d17ba27078cd613058c676917f76f (patch) | |
| tree | cef97bdb9a0cceac05ca2de42551a6b1295b92e0 /apps/files_trashbin | |
| parent | efb026c664376c1091dfad59a506c076e69f0640 (diff) | |
| parent | 6156d71832ee031d8d1f50d8dbff7d0bcfb45541 (diff) | |
| download | nextcloud-server-99c62dfd768d17ba27078cd613058c676917f76f.tar.gz nextcloud-server-99c62dfd768d17ba27078cd613058c676917f76f.zip | |
Merge branch 'master' into fix_glob_escaping
Conflicts:
apps/files_trashbin/lib/trash.php
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/trash.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 2e9c00039db..1235d9d2ee0 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -51,12 +51,19 @@ class Trashbin { $view = new \OC\Files\View('/' . $user); if (!$view->is_dir('files_trashbin')) { $view->mkdir('files_trashbin'); + } + if (!$view->is_dir('files_trashbin/files')) { $view->mkdir('files_trashbin/files'); + } + if (!$view->is_dir('files_trashbin/versions')) { $view->mkdir('files_trashbin/versions'); + } + if (!$view->is_dir('files_trashbin/keyfiles')) { $view->mkdir('files_trashbin/keyfiles'); + } + if (!$view->is_dir('files_trashbin/share-keys')) { $view->mkdir('files_trashbin/share-keys'); } - $path_parts = pathinfo($file_path); $filename = $path_parts['basename']; |