From b13b19c58b802bee42be5efe40aca77519c365ff Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 6 May 2013 13:43:23 +0300 Subject: [PATCH 1/2] Use the internal ownCloud view --- apps/files_trashbin/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 8a5875b9ce..285d5d915f 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -22,7 +22,7 @@ $result = array(); if ($dir) { $dirlisting = true; $fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir); - $dirContent = opendir($fullpath); + $dirContent = $view->opendir($fullpath); $i = 0; while($entryName = readdir($dirContent)) { if ( $entryName != '.' && $entryName != '..' ) { From db1e6b5f3b578e1f3e4b8020507af8d3b36530fb Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 6 May 2013 14:28:01 +0300 Subject: [PATCH 2/2] Use $dir instead of $fullpath --- apps/files_trashbin/index.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 285d5d915f..a32b7414ac 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -21,8 +21,7 @@ $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; $result = array(); if ($dir) { $dirlisting = true; - $fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir); - $dirContent = $view->opendir($fullpath); + $dirContent = $view->opendir($dir); $i = 0; while($entryName = readdir($dirContent)) { if ( $entryName != '.' && $entryName != '..' ) {