From fac2f2a6261e53f7948731291c011f21143891cd Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Mon, 2 Dec 2013 12:13:32 +0100 Subject: check explicitely all possible dir values --- apps/files_trashbin/ajax/delete.php | 5 +++-- 1 file 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'; -- cgit v1.2.3