diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-12-02 12:13:32 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-12-02 16:06:51 +0100 |
| commit | 2d1129012143ea54dd54f1f30a1a830aaad30ded (patch) | |
| tree | dd96cc4d9b84111b2bf3538122586361ced53a2c /apps | |
| parent | 1a197292da1e7955c2599591a672d24b5e0a3f4b (diff) | |
| download | nextcloud-server-2d1129012143ea54dd54f1f30a1a830aaad30ded.tar.gz nextcloud-server-2d1129012143ea54dd54f1f30a1a830aaad30ded.zip | |
check explicitely all possible dir values
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_trashbin/ajax/delete.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 7b41eb1ea80..75d481768ad 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -7,11 +7,12 @@ OCP\JSON::callCheck(); if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true'){ $deleteAll = true; $folder = isset($_POST['dir']) ? $_POST['dir'] : '/'; - if ($folder === '/') { + if ($folder === '/' || $folder === '') { OCA\Files_Trashbin\Trashbin::deleteAll(); $list = array(); } else { - if ( strlen(dirname($folder)) > 1 ) { + $dirname = dirname($folder); + if ( $dirname !== '/' && $dirname !== '.' ) { $dirlisting = '1'; } else { $dirlisting = '0'; |