From 6082a09e6251ba19aa281c4bc8c2c99438df6328 Mon Sep 17 00:00:00 2001 From: Bastien Ho Date: Fri, 10 May 2013 11:12:42 +0200 Subject: [PATCH 1/2] Fix inexisting trashbin's sub-folders --- apps/files_trashbin/lib/trash.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 88c71a75ab..210f72da63 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -39,12 +39,22 @@ class Trashbin { $view = new \OC\Files\View('/'. $user); if (!$view->is_dir('files_trashbin')) { $view->mkdir('files_trashbin'); - $view->mkdir('files_trashbin/files'); - $view->mkdir('files_trashbin/versions'); - $view->mkdir('files_trashbin/keyfiles'); - $view->mkdir('files_trashbin/share-keys'); } - + 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'); + } + if (!$view->is_dir('files_trashbin/files')) { + $view->mkdir('files_trashbin/files'); + } $path_parts = pathinfo($file_path); $filename = $path_parts['basename']; From bb640df06e2d5e25f63ac8a84cdd3e747472f965 Mon Sep 17 00:00:00 2001 From: Bastien Ho Date: Fri, 10 May 2013 11:16:18 +0200 Subject: [PATCH 2/2] duplicate verification --- apps/files_trashbin/lib/trash.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 210f72da63..69adf08dd4 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -52,9 +52,6 @@ class Trashbin { if (!$view->is_dir('files_trashbin/share-keys')) { $view->mkdir('files_trashbin/share-keys'); } - if (!$view->is_dir('files_trashbin/files')) { - $view->mkdir('files_trashbin/files'); - } $path_parts = pathinfo($file_path); $filename = $path_parts['basename'];